ClearML/clearml
1
0
Fork 0
mirror of https://github.com/clearml/clearml synced 2025-05-04 04:51:02 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Change disable default demo server (still optional when setting CLEARML_NO_DEFAULT_SERVER=0)

Browse Source
This commit is contained in:
allegroai 2021-08-12 13:22:09 +03:00
parent 1681e52363
commit 14538053c8
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clearml/backend_api/session/defs.py
View File

@ -12,5 +12,5 @@ ENV_VERBOSE = EnvEntry("CLEARML_API_VERBOSE", "TRAINS_API_VERBOSE", type=bool, d
ENV_HOST_VERIFY_CERT = EnvEntry("CLEARML_API_HOST_VERIFY_CERT", "TRAINS_API_HOST_VERIFY_CERT", ENV_HOST_VERIFY_CERT = EnvEntry("CLEARML_API_HOST_VERIFY_CERT", "TRAINS_API_HOST_VERIFY_CERT",
type=bool, default=True) type=bool, default=True)
ENV_OFFLINE_MODE = EnvEntry("CLEARML_OFFLINE_MODE", "TRAINS_OFFLINE_MODE", type=bool, converter=safe_text_to_bool) ENV_OFFLINE_MODE = EnvEntry("CLEARML_OFFLINE_MODE", "TRAINS_OFFLINE_MODE", type=bool, converter=safe_text_to_bool)
ENV_TRAINS_NO_DEFAULT_SERVER = EnvEntry("CLEARML_NO_DEFAULT_SERVER", "TRAINS_NO_DEFAULT_SERVER", ENV_CLEARML_NO_DEFAULT_SERVER = EnvEntry("CLEARML_NO_DEFAULT_SERVER", "TRAINS_NO_DEFAULT_SERVER",
type=bool, default=False) converter=safe_text_to_bool, type=bool, default=True)

8
clearml/backend_api/session/session.py
View File

@ -13,7 +13,7 @@ from six.moves.urllib.parse import urlparse, urlunparse
from .callresult import CallResult from .callresult import CallResult
from .defs import ( from .defs import (
ENV_VERBOSE, ENV_HOST, ENV_ACCESS_KEY, ENV_SECRET_KEY, ENV_WEB_HOST, ENV_VERBOSE, ENV_HOST, ENV_ACCESS_KEY, ENV_SECRET_KEY, ENV_WEB_HOST,
ENV_FILES_HOST, ENV_OFFLINE_MODE, ENV_TRAINS_NO_DEFAULT_SERVER, ENV_AUTH_TOKEN, ) ENV_FILES_HOST, ENV_OFFLINE_MODE, ENV_CLEARML_NO_DEFAULT_SERVER, ENV_AUTH_TOKEN, )
from .request import Request, BatchRequest # noqa: F401 from .request import Request, BatchRequest # noqa: F401
from .token_manager import TokenManager from .token_manager import TokenManager
from ..config import load from ..config import load
@ -152,9 +152,11 @@ class Session(TokenManager):
if not host: if not host:
raise ValueError("host is required in init or config") raise ValueError("host is required in init or config")
if ENV_TRAINS_NO_DEFAULT_SERVER.get() and host == self.default_demo_host: if ENV_CLEARML_NO_DEFAULT_SERVER.get() and host == self.default_demo_host:
raise ValueError( raise ValueError(
"Configuration file or environment could not be located and default demo server is disabled" "ClearML configuration could not be found (missing `~/clearml.conf` or Environment CLEARML_API_HOST)\n"
"To get started with ClearML: setup your own `clearml-server`, "
"or create a free account at https://app.community.clear.ml"
) )
self._ssl_error_count_verbosity = self.config.get( self._ssl_error_count_verbosity = self.config.get(

4
clearml/cli/config/__main__.py
View File

@ -16,8 +16,8 @@ from clearml.utilities.pyhocon import ConfigFactory, ConfigMissingException
description = "\n" \ description = "\n" \
"Please create new clearml credentials through the profile page in " \ "Please create new clearml credentials through the profile page in " \
"your clearml web app (e.g. http://localhost:8080/profile) \n"\ "your `clearml-server` web app (e.g. http://localhost:8080/profile) \n"\
"Or with the free hosted service at https://app.community.clear.ml/profile\n" \ "Or create a free account at https://app.community.clear.ml/profile\n\n" \
"In the profile page, press \"Create new credentials\", then press \"Copy to clipboard\".\n" \ "In the profile page, press \"Create new credentials\", then press \"Copy to clipboard\".\n" \
"\n" \ "\n" \
"Paste copied configuration here:\n" "Paste copied configuration here:\n"

2
clearml/config/__init__.py
View File

@ -20,7 +20,7 @@ def get_cache_dir():
cache_base_dir = Path( # noqa: F405 cache_base_dir = Path( # noqa: F405
expandvars( expandvars(
expanduser( expanduser(
TRAINS_CACHE_DIR.get() or # noqa: F405 CLEARML_CACHE_DIR.get() or # noqa: F405
config.get("storage.cache.default_base_dir") or config.get("storage.cache.default_base_dir") or
DEFAULT_CACHE_DIR # noqa: F405 DEFAULT_CACHE_DIR # noqa: F405
) )

2
clearml/config/defs.py
View File

@ -17,7 +17,7 @@ LOG_STDERR_REDIRECT_LEVEL = EnvEntry("CLEARML_LOG_STDERR_REDIRECT_LEVEL", "TRAIN
DEV_WORKER_NAME = EnvEntry("CLEARML_WORKER_NAME", "TRAINS_WORKER_NAME") DEV_WORKER_NAME = EnvEntry("CLEARML_WORKER_NAME", "TRAINS_WORKER_NAME")
DEV_TASK_NO_REUSE = EnvEntry("CLEARML_TASK_NO_REUSE", "TRAINS_TASK_NO_REUSE", type=bool) DEV_TASK_NO_REUSE = EnvEntry("CLEARML_TASK_NO_REUSE", "TRAINS_TASK_NO_REUSE", type=bool)
TASK_LOG_ENVIRONMENT = EnvEntry("CLEARML_LOG_ENVIRONMENT", "TRAINS_LOG_ENVIRONMENT", type=str) TASK_LOG_ENVIRONMENT = EnvEntry("CLEARML_LOG_ENVIRONMENT", "TRAINS_LOG_ENVIRONMENT", type=str)
TRAINS_CACHE_DIR = EnvEntry("CLEARML_CACHE_DIR", "TRAINS_CACHE_DIR") CLEARML_CACHE_DIR = EnvEntry("CLEARML_CACHE_DIR", "TRAINS_CACHE_DIR")
DEBUG_SIMULATE_REMOTE_TASK = EnvEntry("CLEARML_SIMULATE_REMOTE_TASK", type=bool) DEBUG_SIMULATE_REMOTE_TASK = EnvEntry("CLEARML_SIMULATE_REMOTE_TASK", type=bool)
DEV_DEFAULT_OUTPUT_URI = EnvEntry("CLEARML_DEFAULT_OUTPUT_URI", type=str) DEV_DEFAULT_OUTPUT_URI = EnvEntry("CLEARML_DEFAULT_OUTPUT_URI", type=str)