[WB-3836] Disabled mode fixes (wandb#1480)

farizrahman4u · web-flow · commit fe0235fb9974 · 2020-11-16T11:01:13.000-08:00
diff --git a/wandb/dummy.py b/wandb/dummy.py
@@ -1,7 +1,4 @@
-from types import ModuleType
-
-
-class Dummy(object):
+class Dummy(str):
     def __init__(self, *args, **kwargs):
         object.__setattr__(self, "___dict", {})
 
@@ -130,8 +127,13 @@ def __getattr__(self, attr):
 
     def __getitem__(self, key):
         d = object.__getattribute__(self, "___dict")
-        if key in d:
-            return d[key]
+        try:
+            if key in d:
+                return d[key]
+        except TypeError:
+            key = str(key)
+            if key in d:
+                return d[key]
         dummy = Dummy()
         d[key] = dummy
         return dummy
@@ -167,10 +169,6 @@ def __bool__(self):
         return True
 
 
-class DummyModule(Dummy, ModuleType):
-    pass
-
-
 class DummyDict(dict):
     __setattr__ = dict.__setitem__
     __delattr__ = dict.__delitem__
diff --git a/wandb/integration/keras/keras.py b/wandb/integration/keras/keras.py
@@ -744,6 +744,8 @@ def _log_dataframe(self):
             return None
 
     def _save_model(self, epoch):
+        if wandb.run.disabled:
+            return
         if self.verbose > 0:
             print(
                 "Epoch %05d: %s improved from %0.5f to %0.5f,"
diff --git a/wandb/sdk/wandb_init.py b/wandb/sdk/wandb_init.py
@@ -14,6 +14,7 @@
 import time
 import traceback
 
+import shortuuid  # type: ignore
 import six
 import wandb
 from wandb import trigger
@@ -313,6 +314,12 @@ def init(self):  # noqa: C901
             run.summary = DummyDict()
             run.log = lambda data, *_, **__: run.summary.update(data)
             run.finish = lambda *_, **__: module.unset_globals()
+            run.step = 0
+            run.resumed = False
+            run.disabled = True
+            run.id = shortuuid.uuid()
+            run.name = "dummy-" + run.id
+            run.dir = "/"
             module.set_global(
                 run=run,
                 config=run.config,
diff --git a/wandb/sdk/wandb_run.py b/wandb/sdk/wandb_run.py
@@ -461,6 +461,10 @@ def mode(self):
     def offline(self):
         return self._settings._offline
 
+    @property
+    def disabled(self):
+        return self._settings._noop
+
     @property
     def group(self):
         """str: name of W&B group associated with run.
@@ -1730,23 +1734,27 @@ def restore(
             ValueError if the file is not found or can't find run_path
     """
 
+    is_disabled = wandb.run is not None and wandb.run.disabled
+    run = None if is_disabled else wandb.run
     if run_path is None:
-        if wandb.run is not None:
-            run_path = wandb.run.path
+        if run is not None:
+            run_path = run.path
         else:
             raise ValueError(
                 "run_path required when calling wandb.restore before wandb.init"
             )
     if root is None:
-        if wandb.run is not None:
-            root = wandb.run.dir
+        if run is not None:
+            root = run.dir
     api = public.Api()
     api_run = api.run(run_path)
     if root is None:
         root = os.getcwd()
     path = os.path.join(root, name)
     if os.path.exists(path) and replace is False:
         return open(path, "r")
+    if is_disabled:
+        return None
     files = api_run.files([name])
     if len(files) == 0:
         return None
diff --git a/wandb/sdk/wandb_settings.py b/wandb/sdk/wandb_settings.py
@@ -915,7 +915,7 @@ def _apply_init(self, args):
                     resume_run_id = json.load(f)["run_id"]
                 if self.run_id is None:
                     self.run_id = resume_run_id
-                else:
+                elif self.run_id != resume_run_id:
                     wandb.termwarn(
                         "Tried to auto resume run with id %s but id %s is set."
                         % (resume_run_id, self.run_id)
diff --git a/wandb/sdk_py27/wandb_init.py b/wandb/sdk_py27/wandb_init.py
@@ -14,6 +14,7 @@
 import time
 import traceback
 
+import shortuuid  # type: ignore
 import six
 import wandb
 from wandb import trigger
@@ -313,6 +314,12 @@ def init(self):  # noqa: C901
             run.summary = DummyDict()
             run.log = lambda data, *_, **__: run.summary.update(data)
             run.finish = lambda *_, **__: module.unset_globals()
+            run.step = 0
+            run.resumed = False
+            run.disabled = True
+            run.id = shortuuid.uuid()
+            run.name = "dummy-" + run.id
+            run.dir = "/"
             module.set_global(
                 run=run,
                 config=run.config,
diff --git a/wandb/sdk_py27/wandb_run.py b/wandb/sdk_py27/wandb_run.py
@@ -461,6 +461,10 @@ def mode(self):
     def offline(self):
         return self._settings._offline
 
+    @property
+    def disabled(self):
+        return self._settings._noop
+
     @property
     def group(self):
         """str: name of W&B group associated with run.
@@ -1730,23 +1734,27 @@ def restore(
             ValueError if the file is not found or can't find run_path
     """
 
+    is_disabled = wandb.run is not None and wandb.run.disabled
+    run = None if is_disabled else wandb.run
     if run_path is None:
-        if wandb.run is not None:
-            run_path = wandb.run.path
+        if run is not None:
+            run_path = run.path
         else:
             raise ValueError(
                 "run_path required when calling wandb.restore before wandb.init"
             )
     if root is None:
-        if wandb.run is not None:
-            root = wandb.run.dir
+        if run is not None:
+            root = run.dir
     api = public.Api()
     api_run = api.run(run_path)
     if root is None:
         root = os.getcwd()
     path = os.path.join(root, name)
     if os.path.exists(path) and replace is False:
         return open(path, "r")
+    if is_disabled:
+        return None
     files = api_run.files([name])
     if len(files) == 0:
         return None
diff --git a/wandb/sdk_py27/wandb_settings.py b/wandb/sdk_py27/wandb_settings.py
@@ -915,7 +915,7 @@ def _apply_init(self, args):
                     resume_run_id = json.load(f)["run_id"]
                 if self.run_id is None:
                     self.run_id = resume_run_id
-                else:
+                elif self.run_id != resume_run_id:
                     wandb.termwarn(
                         "Tried to auto resume run with id %s but id %s is set."
                         % (resume_run_id, self.run_id)
