From 9b9c81afece2cdf78fa1ee619a92a1f929a83400 Mon Sep 17 00:00:00 2001
From: allegroai <>
Date: Sun, 18 Dec 2022 22:58:02 +0200
Subject: [PATCH] Fix `browser_login()` when 3rd party cookies are disabled

---
 clearml/backend_api/session/session.py | 39 ++++++++++++++++++++++++--
 clearml/backend_interface/task/task.py | 11 ++++++--
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/clearml/backend_api/session/session.py b/clearml/backend_api/session/session.py
index e08d4a7b..baf3de74 100644
--- a/clearml/backend_api/session/session.py
+++ b/clearml/backend_api/session/session.py
@@ -34,6 +34,7 @@ from .defs import (
 from .request import Request, BatchRequest  # noqa: F401
 from .token_manager import TokenManager
 from ..utils import get_http_session_with_retry, urllib_log_warning_setup
+from ...backend_config.defs import get_config_file
 from ...debugging import get_logger
 from ...debugging.log import resolve_logging_level
 from ...utilities.pyhocon import ConfigTree, ConfigFactory
@@ -943,11 +944,43 @@ def browser_login(clearml_server=None):
                     "or create a free account at {}\n".format(clearml_app_server)
                 )
                 print("Please login to {} , then press [Enter] to connect ".format(clearml_app_server), end="")
-            else:
+                input()
+            elif counter < 1:
                 print("Oh no we failed to connect \N{worried face}, "
                       "try to logout and login again - Press [Enter] to retry ", end="")
+                input()
+            else:
+                print(
+                    "\n"
+                    "We cannot connect automatically (adblocker / incognito?) \N{worried face} \n"
+                    "Please go to {}/settings/workspace-configuration \n"
+                    "Then press \x1B[1m\x1B[48;2;26;30;44m\x1B[37m + Create new credentials \x1b[0m \n"
+                    "And copy/paste your \x1B[1m\x1B[4mAccess Key\x1b[0m here: ".format(
+                        clearml_app_server.lstrip("/")), end="")
+
+                creds = input()
+                if creds:
+                    print(" Setting access key ")
+                    ENV_ACCESS_KEY.set(creds.strip())
+
+                print("Now copy/paste your \x1B[1m\x1B[4mSecret Key\x1b[0m here: ", end="")
+                creds = input()
+                if creds:
+                    print(" Setting secret key ")
+                    ENV_SECRET_KEY.set(creds.strip())
+
+                if ENV_ACCESS_KEY.get() and ENV_SECRET_KEY.get():
+                    # store in conf file for persistence in runtime
+                    # noinspection PyBroadException
+                    try:
+                        with open(get_config_file(), "wt") as f:
+                            f.write("api.credentials.access_key={}\napi.credentials.secret_key={}\n".format(
+                                ENV_ACCESS_KEY.get(), ENV_SECRET_KEY.get()
+                            ))
+                    except Exception:
+                        pass
+                    break
 
-            input()
             counter += 1
 
     print("")
@@ -959,6 +992,8 @@ def browser_login(clearml_server=None):
     if token:
         # set Token
         ENV_AUTH_TOKEN.set(token)
+
+    if token or (ENV_ACCESS_KEY.get() and ENV_SECRET_KEY.get()):
         # verify token
         Session()
         # success
diff --git a/clearml/backend_interface/task/task.py b/clearml/backend_interface/task/task.py
index 7afed84c..b04994da 100644
--- a/clearml/backend_interface/task/task.py
+++ b/clearml/backend_interface/task/task.py
@@ -681,7 +681,9 @@ class Task(IdObjectBase, AccessMixin, SetupUploadMixin):
         """
         if hasattr(tasks, 'CompletedRequest') and callable(tasks.CompletedRequest):
             return self.send(
-                tasks.CompletedRequest(self.id, status_reason='completed', status_message=status_message, force=force),
+                tasks.CompletedRequest(
+                    self.id, status_reason='completed', status_message=status_message, force=force,
+                    publish=True if self._get_runtime_properties().get("_publish_on_complete") else False),
                 ignore_errors=ignore_errors
             )
         return self.send(
@@ -707,6 +709,11 @@ class Task(IdObjectBase, AccessMixin, SetupUploadMixin):
         assert isinstance(resp.response, tasks.PublishResponse)
         return resp
 
+    def publish_on_completion(self, enable=True):
+        # type: (bool) -> ()
+        """ The signal that this task will be published automatically on task completion """
+        self._set_runtime_properties(runtime_properties={"_publish_on_complete": enable})
+
     def _delete(
         self,
         delete_artifacts_and_models=True,
@@ -2154,7 +2161,7 @@ class Task(IdObjectBase, AccessMixin, SetupUploadMixin):
 
         Notice: Must be called before `Task.init` !
 
-        :param force: Set force using `pip freeze` flag on/off
+        :param force: Set force storing the main python file as a single standalone script
         """
         cls._force_store_standalone_script = bool(force)