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

Add support for conda activation. Move default conf into ~/.clearmlrc

Browse Source
This commit is contained in:
allegroai 2024-04-20 23:43:45 +03:00
parent d092209cf6
commit 09ad33bbdb
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
clearml_session/interactive_session_task.py
View File

@ -798,6 +798,9 @@ def setup_user_env(param, task):
env['CLEARML_API_SECRET_KEY'] = param.get("user_secret") env['CLEARML_API_SECRET_KEY'] = param.get("user_secret")
return env return env
# target source config
source_conf = '~/.clearmlrc'
# create symbolic link to the venv # create symbolic link to the venv
environment = os.path.expanduser('~/environment') environment = os.path.expanduser('~/environment')
# noinspection PyBroadException # noinspection PyBroadException
@ -810,46 +813,45 @@ def setup_user_env(param, task):
# set default user credentials # set default user credentials
if param.get("user_key") and param.get("user_secret"): if param.get("user_key") and param.get("user_secret"):
os.system("echo 'export CLEARML_API_ACCESS_KEY=\"{}\"' >> ~/.bashrc".format( os.system("echo 'export CLEARML_API_ACCESS_KEY=\"{}\"' >> {}".format(
param.get("user_key", "").replace('$', '\\$'))) param.get("user_key", "").replace('$', '\\$'), source_conf))
os.system("echo 'export CLEARML_API_SECRET_KEY=\"{}\"' >> ~/.bashrc".format( os.system("echo 'export CLEARML_API_SECRET_KEY=\"{}\"' >> {}".format(
param.get("user_secret", "").replace('$', '\\$'))) param.get("user_secret", "").replace('$', '\\$'), source_conf))
os.system("echo 'export CLEARML_API_ACCESS_KEY=\"{}\"' >> ~/.profile".format(
param.get("user_key", "").replace('$', '\\$')))
os.system("echo 'export CLEARML_API_SECRET_KEY=\"{}\"' >> ~/.profile".format(
param.get("user_secret", "").replace('$', '\\$')))
env['CLEARML_API_ACCESS_KEY'] = param.get("user_key") env['CLEARML_API_ACCESS_KEY'] = param.get("user_key")
env['CLEARML_API_SECRET_KEY'] = param.get("user_secret") env['CLEARML_API_SECRET_KEY'] = param.get("user_secret")
elif os.environ.get("CLEARML_AUTH_TOKEN"): elif os.environ.get("CLEARML_AUTH_TOKEN"):
env['CLEARML_AUTH_TOKEN'] = os.environ.get("CLEARML_AUTH_TOKEN") env['CLEARML_AUTH_TOKEN'] = os.environ.get("CLEARML_AUTH_TOKEN")
os.system("echo 'export CLEARML_AUTH_TOKEN=\"{}\"' >> ~/.bashrc".format( os.system("echo 'export CLEARML_AUTH_TOKEN=\"{}\"' >> {}".format(
os.environ.get("CLEARML_AUTH_TOKEN").replace('$', '\\$'))) os.environ.get("CLEARML_AUTH_TOKEN").replace('$', '\\$'), source_conf))
os.system("echo 'export CLEARML_AUTH_TOKEN=\"{}\"' >> ~/.profile".format(
os.environ.get("CLEARML_AUTH_TOKEN").replace('$', '\\$')))
if param.get("default_docker"): if param.get("default_docker"):
os.system("echo 'export CLEARML_DOCKER_IMAGE=\"{}\"' >> ~/.profile".format( os.system("echo 'export CLEARML_DOCKER_IMAGE=\"{}\"' >> {}".format(
param.get("default_docker", "").strip() or env.get('CLEARML_DOCKER_IMAGE', ''))) param.get("default_docker", "").strip() or env.get('CLEARML_DOCKER_IMAGE', ''), source_conf))
os.system("echo 'export CLEARML_DOCKER_IMAGE=\"{}\"' >> ~/.bashrc".format(
param.get("default_docker", "").strip() or env.get('CLEARML_DOCKER_IMAGE', '')))
if vault_environment: if vault_environment:
for k, v in vault_environment.items(): for k, v in vault_environment.items():
os.system("echo 'export {}=\"{}\"' >> ~/.profile".format(k, v)) os.system("echo 'export {}=\"{}\"' >> {}".format(k, v, source_conf))
os.system("echo 'export {}=\"{}\"' >> ~/.bashrc".format(k, v))
env[k] = str(v) if v else "" env[k] = str(v) if v else ""
# make sure we activate the venv in the bash
if Path(os.path.join(environment, 'bin', 'activate')).expanduser().exists():
os.system("echo 'source {}' >> {}".format(os.path.join(environment, 'bin', 'activate'), source_conf))
elif Path(os.path.join(environment, 'etc', 'conda', 'activate.d')).expanduser().exists():
# let conda patch the bashrc
os.system("conda init")
# make sure we activate this environment by default
os.system("echo 'conda activate {}' >> {}".format(environment, source_conf))
# set default folder for user # set default folder for user
if param.get("user_base_directory"): if param.get("user_base_directory"):
base_dir = param.get("user_base_directory") base_dir = param.get("user_base_directory")
if ' ' in base_dir: if ' ' in base_dir:
base_dir = '\"{}\"'.format(base_dir) base_dir = '\"{}\"'.format(base_dir)
os.system("echo 'cd {}' >> ~/.bashrc".format(base_dir)) os.system("echo 'cd {}' >> {}".format(base_dir, source_conf))
os.system("echo 'cd {}' >> ~/.profile".format(base_dir))
# make sure we activate the venv in the bash # make sure we load the source configuration
os.system("echo 'source {}' >> ~/.bashrc".format(os.path.join(environment, 'bin', 'activate'))) os.system("echo 'source {}' >> ~/.bashrc".format(source_conf))
os.system("echo '. {}' >> ~/.profile".format(os.path.join(environment, 'bin', 'activate'))) os.system("echo '. {}' >> ~/.profile".format(source_conf))
# check if we need to create .git-credentials # check if we need to create .git-credentials