Skip to content

Commit

Permalink
more logs
Browse files Browse the repository at this point in the history
  • Loading branch information
@agahkarakuzu
agahkarakuzu committed Dec 9, 2024
1 parent 95d2088 commit ae3386e
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 26 deletions.
3 changes: 2 additions & 1 deletion myst_libre/builders/myst_builder.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ def build(self,*args,user=None,group=None):
self.cprint(f'Starting MyST build {self.hub.jh_url}','yellow')
else:
self.cprint(f'Starting MyST build no exec.','yellow')
self.myst_client.build('build',*args,user=user,group=group)
logs = self.myst_client.build('build',*args,user=user,group=group)
return logs
60 changes: 37 additions & 23 deletions myst_libre/tools/jupyter_hub_local_spawner.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,11 @@ def _is_port_in_use(self, port):
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
return s.connect_ex(('127.0.0.1', port)) == 0

def spawn_jupyter_hub(self,jb_build_command=None):
def spawn_jupyter_hub(self, jb_build_command=None):
"""
Spawn a JupyterHub instance.
"""
output_logs = [] # Collect logs and cprints here
self.port = self.find_open_port()
h = blake2b(digest_size=20)
h.update(os.urandom(20))
Expand All @@ -96,8 +97,8 @@ def spawn_jupyter_hub(self,jb_build_command=None):

if self.rees.dataset_name:
self.rees.repo2data_download(self.host_data_parent_dir)
mnt_vol = {f'{os.path.join(self.host_data_parent_dir,self.rees.dataset_name)}': {'bind': os.path.join(self.container_data_mount_dir,self.rees.dataset_name), 'mode': 'ro'},
self.rees.build_dir: {'bind': f'{self.container_build_source_mount_dir}', 'mode': 'rw'}}
mnt_vol = {f'{os.path.join(self.host_data_parent_dir, self.rees.dataset_name)}': {'bind': os.path.join(self.container_data_mount_dir, self.rees.dataset_name), 'mode': 'ro'},
self.rees.build_dir: {'bind': f'{self.container_build_source_mount_dir}', 'mode': 'rw'}}
else:
mnt_vol = {self.rees.build_dir: {'bind': f'{self.container_build_source_mount_dir}', 'mode': 'rw'}}

Expand All @@ -107,33 +108,46 @@ def spawn_jupyter_hub(self,jb_build_command=None):
self.container = self.rees.docker_client.containers.run(
self.rees.docker_image,
ports={f'{self.port}/tcp': self.port},
environment={"JUPYTER_TOKEN": f'{self.jh_token}',"port": f'{self.port}',"JUPYTER_BASE_URL": f'{self.jh_url}'},
entrypoint= this_entrypoint,
environment={"JUPYTER_TOKEN": f'{self.jh_token}', "port": f'{self.port}', "JUPYTER_BASE_URL": f'{self.jh_url}'},
entrypoint=this_entrypoint,
volumes=mnt_vol,
detach=True)
logging.info(f'Jupyter hub is {self.container.status}')
self.cprint(f'␤[Status]', 'light_grey')
self.cprint(f' ├─────── ⏺ running', 'green')
self.cprint(f' └─────── Container {self.container.short_id} {self.container.name}', 'green')
self.cprint(f' ℹ Run the following commands in the terminal if you are debugging locally:', 'yellow')
self.cprint(f' port=\"{self.port}\"', 'cyan')
self.cprint(f' export JUPYTER_BASE_URL=\"{self.jh_url}\"', 'cyan')
self.cprint(f' export JUPYTER_TOKEN=\"{self.jh_token}\"', 'cyan')
self.cprint(f'␤[Resources]', 'light_grey')
self.cprint(f' ├── MyST repository', 'magenta')
self.cprint(f' │ ├───────── ✸ {self.rees.gh_user_repo_name}','light_blue')
self.cprint(f' │ ├───────── ⎌ {self.rees.gh_repo_commit_hash}','light_blue')
self.cprint(f" │ └───────── ⏲ {self.rees.repo_commit_info['datetime']}: {self.rees.repo_commit_info['message']}".replace('\n', ''),'light_blue')
self.cprint(f' └── Docker container', 'magenta')
self.cprint(f' ├───────── ✸ {self.rees.pull_image_name}','light_blue')
self.cprint(f' ├───────── ⎌ {self.rees.binder_image_tag}','light_blue')
self.cprint(f" ├───────── ⏲ {self.rees.binder_commit_info['datetime']}: {self.rees.binder_commit_info['message']}".replace('\n', ''),'light_blue')

# Use the helper function to log and print messages
def log_and_print(message, color=None):
output_logs.append(message)
if color:
self.cprint(message, color)
else:
print(message)

# Collecting and printing output
log_and_print('␤[Status]', 'light_grey')
log_and_print(' ├─────── ⏺ running', 'green')
log_and_print(f' └─────── Container {self.container.short_id} {self.container.name}', 'green')
log_and_print(' ℹ Run the following commands in the terminal if you are debugging locally:', 'yellow')
log_and_print(f' port="{self.port}"', 'cyan')
log_and_print(f' export JUPYTER_BASE_URL="{self.jh_url}"', 'cyan')
log_and_print(f' export JUPYTER_TOKEN="{self.jh_token}"', 'cyan')
log_and_print('␤[Resources]', 'light_grey')
log_and_print(' ├── MyST repository', 'magenta')
log_and_print(f' │ ├───────── ✸ {self.rees.gh_user_repo_name}', 'light_blue')
log_and_print(f' │ ├───────── ⎌ {self.rees.gh_repo_commit_hash}', 'light_blue')
log_and_print(f" │ └───────── ⏲ {self.rees.repo_commit_info['datetime']}: {self.rees.repo_commit_info['message']}".replace('\n', ''), 'light_blue')
log_and_print(' └── Docker container', 'magenta')
log_and_print(f' ├───────── ✸ {self.rees.pull_image_name}', 'light_blue')
log_and_print(f' ├───────── ⎌ {self.rees.binder_image_tag}', 'light_blue')
log_and_print(f" ├───────── ⏲ {self.rees.binder_commit_info['datetime']}: {self.rees.binder_commit_info['message']}".replace('\n', ''), 'light_blue')
if self.rees.binder_image_name:
self.cprint(f' └───────── ℹ Using NeuroLibre base image {self.rees.binder_image_name}','yellow')
log_and_print(f' └───────── ℹ Using NeuroLibre base image {self.rees.binder_image_name}', 'yellow')
else:
self.cprint(f' └───────── ℹ This image was built from REES-compliant {self.rees.gh_user_repo_name} repository at the commit above','yellow')
log_and_print(f' └───────── ℹ This image was built from REES-compliant {self.rees.gh_user_repo_name} repository at the commit above', 'yellow')
except Exception as e:
logging.error(f'Could not spawn a JH: \n {e}')
output_logs.append(f'Error: {e}') # Collecting error output

return output_logs # Return collected logs and cprints

def delete_stopped_containers(self):
"""
Expand Down
2 changes: 0 additions & 2 deletions myst_libre/tools/myst_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,7 @@ def build(self, *args, user=None, group=None):
str: Command output or None if failed.
"""
os.chdir(self.build_dir)
#self.cprint(f"--> Self env vars {self.env_vars}", "green")
stdout_log, stderr_log = self.run_command(*args, env_vars=self.env_vars, user=user, group=group)
#self.cprint(f"🐞 Command output: {stdout_log}", "light_grey")
if stderr_log is not None:
stdout_log += stderr_log
return stdout_log
Expand Down

0 comments on commit ae3386e

Please sign in to comment.