From 0fe9901eea8b5d6925b237be77b312831a9acabf Mon Sep 17 00:00:00 2001 From: vladd-bit Date: Wed, 18 Nov 2026 10:22:12 +0000 Subject: [PATCH 1/4] Chore: removed app charts in favour of storing them in 'helm-charts' folder. --- .../charts/cogstack-jupyterhub/.helmignore | 10 - .../charts/cogstack-jupyterhub/Chart.yaml | 6 - .../charts/cogstack-jupyterhub/README.md | 38 -- .../files/config/jupyterhub_config.py | 457 ------------------ .../files/config/jupyterhub_cookie_secret | 1 - .../cogstack-jupyterhub/files/config/teamlist | 1 - .../cogstack-jupyterhub/files/config/userlist | 2 - .../cogstack-jupyterhub/templates/NOTES.txt | 22 - .../templates/_helpers.tpl | 59 --- .../templates/configmap-env-files.yaml | 26 - .../templates/configmap-hub-files.yaml | 34 -- .../templates/deployment.yaml | 152 ------ .../templates/ingress.yaml | 35 -- .../templates/pvc-hub.yaml | 17 - .../templates/pvc-scratch.yaml | 17 - .../templates/secret-hub-files.yaml | 37 -- .../templates/service.yaml | 19 - .../templates/serviceaccount.yaml | 12 - .../charts/cogstack-jupyterhub/values.yaml | 90 ---- .../charts/ocr-service/.helmignore | 4 - .../ocr-service/charts/ocr-service/Chart.yaml | 6 - apps/ocr-service/charts/ocr-service/README.md | 82 ---- .../charts/ocr-service/templates/NOTES.txt | 7 - .../charts/ocr-service/templates/_helpers.tpl | 60 --- .../ocr-service/templates/deployment.yaml | 117 ----- .../charts/ocr-service/templates/hpa.yaml | 32 -- .../charts/ocr-service/templates/service.yaml | 15 - .../ocr-service/templates/serviceaccount.yaml | 13 - .../charts/ocr-service/values-text-only.yaml | 2 - .../charts/ocr-service/values.yaml | 123 ----- 30 files changed, 1496 deletions(-) delete mode 100644 apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/.helmignore delete mode 100644 apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/Chart.yaml delete mode 100644 apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/README.md delete mode 100755 apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/files/config/jupyterhub_config.py delete mode 100644 apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/files/config/jupyterhub_cookie_secret delete mode 100755 apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/files/config/teamlist delete mode 100755 apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/files/config/userlist delete mode 100644 apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/NOTES.txt delete mode 100644 apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/_helpers.tpl delete mode 100644 apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/configmap-env-files.yaml delete mode 100644 apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/configmap-hub-files.yaml delete mode 100644 apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/deployment.yaml delete mode 100644 apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/ingress.yaml delete mode 100644 apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/pvc-hub.yaml delete mode 100644 apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/pvc-scratch.yaml delete mode 100644 apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/secret-hub-files.yaml delete mode 100644 apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/service.yaml delete mode 100644 apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/serviceaccount.yaml delete mode 100644 apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/values.yaml delete mode 100644 apps/ocr-service/charts/ocr-service/.helmignore delete mode 100644 apps/ocr-service/charts/ocr-service/Chart.yaml delete mode 100644 apps/ocr-service/charts/ocr-service/README.md delete mode 100644 apps/ocr-service/charts/ocr-service/templates/NOTES.txt delete mode 100644 apps/ocr-service/charts/ocr-service/templates/_helpers.tpl delete mode 100644 apps/ocr-service/charts/ocr-service/templates/deployment.yaml delete mode 100644 apps/ocr-service/charts/ocr-service/templates/hpa.yaml delete mode 100644 apps/ocr-service/charts/ocr-service/templates/service.yaml delete mode 100644 apps/ocr-service/charts/ocr-service/templates/serviceaccount.yaml delete mode 100644 apps/ocr-service/charts/ocr-service/values-text-only.yaml delete mode 100644 apps/ocr-service/charts/ocr-service/values.yaml diff --git a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/.helmignore b/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/.helmignore deleted file mode 100644 index 9d315138..00000000 --- a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/.helmignore +++ /dev/null @@ -1,10 +0,0 @@ -# Common VCS directories -.git/ -.gitignore - -# IDE files -.vscode/ -.idea/ - -# macOS -.DS_Store diff --git a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/Chart.yaml b/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/Chart.yaml deleted file mode 100644 index 33532eae..00000000 --- a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v2 -name: cogstack-jupyterhub -description: Helm chart for deploying CogStack JupyterHub -type: application -version: 0.1.0 -appVersion: "2.2.3" diff --git a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/README.md b/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/README.md deleted file mode 100644 index 01c1a1cb..00000000 --- a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/README.md +++ /dev/null @@ -1,38 +0,0 @@ -# cogstack-jupyterhub Helm Chart - -This chart deploys the CogStack JupyterHub service and mirrors the current Docker Compose setup: - -- loads `env/general.env` and `env/jupyter.env` -- mounts `jupyterhub_config.py`, `userlist`, and `teamlist` -- mounts TLS/cookie files used by JupyterHub -- mounts `/var/run/docker.sock` for DockerSpawner - -## Install using repo env files - -From the repository root: - -```bash -helm upgrade --install cogstack-jupyterhub ./charts/cogstack-jupyterhub \ - --namespace cogstack --create-namespace \ - --set envFiles.useBundled=false \ - --set hubFiles.useBundled=false \ - --set securityFiles.useBundled=false \ - --set-file envFiles.jupyter=env/jupyter.env \ - --set-file envFiles.general=env/general.env \ - --set-file hubFiles.jupyterhubConfig=config/jupyterhub_config.py \ - --set-file hubFiles.userlist=config/userlist \ - --set-file hubFiles.teamlist=config/teamlist \ - --set-file securityFiles.cookieSecret=config/jupyterhub_cookie_secret \ - --set-file securityFiles.tlsKey=security/nifi.key \ - --set-file securityFiles.tlsCert=security/nifi.pem -``` - -## Bundled file mode - -By default, the chart contains copies of current repo files under `charts/cogstack-jupyterhub/files/*`. -If you leave `*.useBundled=true`, Helm will use those bundled copies. - -## Notes - -- This chart keeps DockerSpawner behavior, so it mounts the host Docker socket. -- For multi-node/production Kubernetes, migrating to KubeSpawner is strongly recommended. diff --git a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/files/config/jupyterhub_config.py b/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/files/config/jupyterhub_config.py deleted file mode 100755 index 543850b0..00000000 --- a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/files/config/jupyterhub_config.py +++ /dev/null @@ -1,457 +0,0 @@ -# Configuration file for jupyter-hub -# source : https://github.com/jupyterhub/jupyterhub-deploy-docker/blob/main/basic-example/jupyterhub_config.py - -import os -import sys -import docker -import dockerspawner -import traceback -import logging -#import traitlets -from jupyterhub.auth import LocalAuthenticator -from nativeauthenticator import NativeAuthenticator -from traitlets.config import Config -from oauthenticator.generic import GenericOAuthenticator - - -class LocalNativeAuthenticator(NativeAuthenticator, LocalAuthenticator): - pass - - -DOCKER_NOTEBOOK_IMAGE = os.getenv("JUPYTER_HUB_SINGLEUSER_DOCKER_NOTEBOOK_IMAGE", - "cogstacksystems:jupyterhub/singleuser:latest") - -# JupyterHub requires a single-user instance of the Notebook server, so we -# default to using the `start-singleuser.sh` script included in the -# jupyter/docker-stacks *-notebook images as the Docker run command when -# spawning containers. Optionally, you can override the Docker run command -# using the JUPYTER_HUB_DOCKER_SPAWN_CMD environment variable. -SPAWN_CMD = os.environ.get("JUPYTER_HUB_DOCKER_SPAWN_CMD", "start-singleuser.py") - -# Connect containers to this Docker network -# IMPORTANT, THIS MUST MATCH THE NETWORK DECLARED in "services.yml", by default: "cogstack-net" -NETWORK_NAME = os.environ.get("JUPYTER_HUB_DOCKER_NETWORK_NAME", "cogstack-net") - -# The IP address or hostname of the JupyterHub container in the Docker network -HUB_CONTAINER_IP_OR_NAME = os.environ.get("JUPYTER_HUB_DOCKER_CONTAINER_NAME", "cogstack-jupyter-hub") - -# The timeout in seconds after which the idle notebook container will be shutdown - 7 days -NOTEBOOK_IDLE_TIMEOUT = int(os.environ.get("DOCKER_NOTEBOOK_IDLE_TIMEOUT", str(7 * 24 * 60 * 60))) - -SELECT_NOTEBOOK_IMAGE_ALLOWED = str(os.environ.get("JUPYTERHUB_DOCKER_SELECT_NOTEBOOK_IMAGE_ALLOWED", "false")).lower() - -RUN_IN_DEBUG_MODE = str(os.environ.get("JUPYTERHUB_DOCKER_NOTEBOOK_DEBUG_MODE", "false")).lower() - -ENABLE_OIDC_AUTH = str(os.environ.get("JUPYTERHUB_DOCKER_ENABLE_OIDC_AUTH", "false")).lower() - -# Explicitly set notebook directory because we"ll be mounting a host volume to -# it. Most jupyter/docker-stacks *-notebook images run the Notebook server as -# user `jovyan`, and set the notebook directory to `/home/jovyan/work`. -# We follow the same convention. -NOTEBOOK_DIR = os.environ.get("JUPYTER_HUB_DOCKER_NOTEBOOK_DIR", "/home/jovyan/work") -SHARED_CONTENT_DIR = os.environ.get("JUPYTER_HUB_DOCKER_SHARED_DIR", "/home/jovyan/scratch") -#WORK_DIR = os.environ.get("DOCKER_JUPYTER_WORK_DIR", "/lab/workspaces/auto-b/tree/" + str(NOTEBOOK_DIR.split("/")[-1])) -WORK_DIR = "/lab/" - -ENV_PROXIES = { - "HTTP_PROXY": os.environ.get("HTTP_PROXY", ""), - "HTTPS_PROXY": os.environ.get("HTTPS_PROXY", ""), - "NO_PROXY": ",".join(list(filter(len, os.environ.get("NO_PROXY", "").split(",") + [HUB_CONTAINER_IP_OR_NAME]))), - "http_proxy": os.environ.get("HTTP_PROXY", os.environ.get("http_proxy", "")), - "https_proxy": os.environ.get("HTTPS_PROXY", os.environ.get("https_proxy", "")), - "no_proxy": ",".join(list(filter(len, os.environ.get("no_proxy", "").split(",") + [HUB_CONTAINER_IP_OR_NAME]))), -} - -os.environ["NO_PROXY"] = "" -os.environ["no_proxy"] = "" -os.environ["HTTP_PROXY"] = "" -os.environ["HTTPS_PROXY"] = "" -os.environ["http_proxy"] = "" -os.environ["https_proxy"] = "" - -c: Config = get_config() - -# Spawn containers from this image -# Either use the CoGstack one from the repo which is huge and contains all the stuff needed or, -# use the default official one which is clean. -c.DockerSpawner.image = DOCKER_NOTEBOOK_IMAGE - -c.DockerSpawner.use_internal_ip = True -c.DockerSpawner.network_name = NETWORK_NAME -# Pass the network name as argument to spawned containers -c.DockerSpawner.extra_host_config = {"network_mode": NETWORK_NAME} - -# # Mount the real users Docker volume on the host to the notebook user"s -# # notebook directory in the container -c.DockerSpawner.volumes = {"jupyterhub-user-{username}": NOTEBOOK_DIR, "jupyter-hub-shared-scratch": SHARED_CONTENT_DIR} - -# Remove containers once they are stopped -c.DockerSpawner.remove = False - -if SELECT_NOTEBOOK_IMAGE_ALLOWED == "true": - # c.DockerSpawner.image_whitelist has been deprecated for allowed_images - c.DockerSpawner.allowed_images = { - "minimal": "jupyterhub/singleuser:latest", - "cogstack": "cogstacksystems/jupyter-singleuser:latest", - "cogstack-gpu": "cogstacksystems/jupyter-singleuser-gpu:latest" - } - # https://github.com/jupyterhub/dockerspawner/issues/423 - c.DockerSpawner.remove = True - -if RUN_IN_DEBUG_MODE == "true": - # For debugging arguments passed to spawned containers - c.DockerSpawner.debug = True - c.Spawner.debug = True - # Enable debug-logging of the single-user server - c.LocalProcessSpawner.debug = True - - -# Spawn single-user servers as Docker containers -class DockerSpawner(dockerspawner.DockerSpawner): - def start(self): - # username is self.user.name - self.volumes = {"jupyterhub-user-{}".format(self.user.name): NOTEBOOK_DIR} - - # Mount the real users Docker volume on the host to the notebook user"s - # # notebook directory in the container - #self.volumes = {f"jupyterhub-user-{self.user.name}": NOTEBOOK_DIR, "jupyter-hub-shared-scratch": SHARED_CONTENT_DIR} - - if self.user.name not in whitelist: - whitelist.add(self.user.name) - with open(userlist_path, "a") as f: - f.write("\n") - f.write(self.user.name) - - if self.user.name in list(team_map.keys()): - for team in team_map[self.user.name]: - team_dir_path = os.path.join(SHARED_CONTENT_DIR, team) - self.volumes["jupyterhub-team-{}".format(team)] = { - "bind": team_dir_path, - "mode": "rw", # or ro for read-only - } - - # this is a temporary fix, need to actually check permissions - self.mem_limit = RESOURCE_ALLOCATION_USER_RAM_LIMIT - self.post_start_cmd = "chmod -R 777 " + SHARED_CONTENT_DIR - - return super().start() - - -def pre_spawn_hook(spawner: DockerSpawner): - #username = spawner.user.name - #spawner.environment["GREETING"] = f"Hello {username}" - try: - for key, value in ENV_PROXIES.items(): - spawner.environment[str(key)] = str(value) - with open("/home/jovyan/test.txt", "w+") as f: - for key, value in ENV_PROXIES.items(): - f.write("export" + " " + str(key) + "=" + str(value) + "\n") - except Exception: - traceback.print_exc() - - -""" - def pre_spawn_hook(spawner): - username = str(spawner.user.name).lower() - try: - pwd.getpwnam(username) - except KeyError: - subprocess.check_call(["useradd", "-ms", "/bin/bash", username]) -""" - -c.Spawner.default_url = WORK_DIR -c.Spawner.pre_spawn_hook = pre_spawn_hook - -#c.Spawner.ip = "127.0.0.1" - -# This is buggy, setting the HTTP(s)_PROXY & NO_PROXY variables via pre/post -# spawn hook is better -#c.Spawner.environment = ENV_PROXIES - -# AUTHENTICATION -#c.Authenticator.allowed_users = {"admin"} -c.Authenticator.admin_users = admin = {"admin"} - -# By default all users that make sign up on Native Authenticator -# need an admin approval so they can actually log in the system. -c.Authenticator.open_signup = False - -c.NotebookApp.allow_root = False - -c.LocalAuthenticator.create_system_users = True -c.SystemdSpawner.dynamic_users = True -c.PAMAuthenticator.admin_groups = {"wheel"} -c.Authenticator.allowed_users = whitelist = set() - -#c.Authenticator.manage_groups = True -#c.Authenticator.allow_all = True - -curr_dir = os.path.dirname(__file__) - -# Get active users -userlist_path = os.path.join(curr_dir, "userlist") -teamlist_path = os.path.join(curr_dir, "teamlist") - -# Resource allocation env vars -# RAM - GB of ram, CPU - num of cores -RESOURCE_ALLOCATION_USER_CPU_LIMIT = os.environ.get("JUPYTER_HUB_SINGLEUSER_RESOURCE_ALLOCATION_USER_CPU_LIMIT", "2") -RESOURCE_ALLOCATION_USER_RAM_LIMIT = os.environ.get("JUPYTER_HUB_SINGLEUSER_RESOURCE_ALLOCATION_USER_RAM_LIMIT", "2.0G") -RESOURCE_ALLOCATION_ADMIN_CPU_LIMIT = os.environ.get("JUPYTER_HUB_SINGLEUSER_RESOURCE_ALLOCATION_ADMIN_CPU_LIMIT", "2") -RESOURCE_ALLOCATION_ADMIN_RAM_LIMIT = os.environ.get("JUPYTER_HUB_SINGLEUSER_RESOURCE_ALLOCATION_ADMIN_RAM_LIMIT", "4.0G") - - -def per_user_limit(role): - ram_limits = {"user": (int(RESOURCE_ALLOCATION_USER_CPU_LIMIT), RESOURCE_ALLOCATION_USER_RAM_LIMIT), - "admin": (int(RESOURCE_ALLOCATION_ADMIN_CPU_LIMIT), RESOURCE_ALLOCATION_ADMIN_RAM_LIMIT)} - return ram_limits.get(role) - - -# Spawn single-user servers as Docker containers -c.JupyterHub.spawner_class = DockerSpawner - -# set DockerSpawner args -c.DockerSpawner.extra_create_kwargs = {"user": "root"} -c.DockerSpawner.args = [ - "--allow-root", - "--NotebookApp.token=''", -] - -c.DockerSpawner.cmd = [SPAWN_CMD] if isinstance(SPAWN_CMD, str) else SPAWN_CMD - -c.DockerSpawner.notebook_dir = NOTEBOOK_DIR - -with open(userlist_path) as f: - for line in f: - if not line: - continue - parts = line.split() - # in case of newline at the end of userlist file - if len(parts) >= 1: - name = str(parts[0]).lower() - role = "user" - - if (len(parts) > 1): - role = parts[1] - whitelist.add(name) - if len(parts) > 1 and role == "admin": - admin.add(name) - - c.Spawner.mem_limit = c.SwarmSpawner.mem_limit = c.DockerSpawner.mem_limit = per_user_limit(role)[1] - c.Spawner.cpu_limit = c.SwarmSpawner.cpu_limit = c.DockerSpawner.cpu_limit = per_user_limit(role)[0] - - c.Spawner.cpu_guarantee = c.SwarmSpawner.cpu_guarantee = c.DockerSpawner.cpu_guarantee = 1 - c.Spawner.mem_guarantee = c.SwarmSpawner.mem_guarantee = c.DockerSpawner.mem_guarantee = "1.0G" - - prev_conf = c.DockerSpawner.extra_host_config - prev_conf.update({"mem_limit": c.DockerSpawner.mem_limit}) - - c.DockerSpawner.extra_host_config = prev_conf - -# Get team memberships -team_map = {user: set() for user in whitelist} -with open(teamlist_path) as f: - for line in f: - if not line: - continue - parts = line.split() - if len(parts) > 1: - team = parts[0] - members = set(parts[1:]) - for member in members: - team_map[member].add(team) - -gpu_support_enabled = os.environ.get("JUPYTERHUB_DOCKER_ENABLE_GPU_SUPPORT", "false") - -if gpu_support_enabled.lower() == "true": - c.DockerSpawner.extra_host_config = { - "device_requests": [ - docker.types.DeviceRequest( - count=-1, - capabilities=[["gpu", "utility", "compute", "video"]] - ), - ], - } - -c.DockerSpawner.environment = { - "GRANT_SUDO": "1", - "UID": "0", # workaround https://github.com/jupyter/docker-stacks/pull/420, -} - -c.DockerSpawner.environment.update(ENV_PROXIES) - -# Alternative, use: "nativeauthenticator.NativeAuthenticator" -#c.JupyterHub.authenticator_class = LocalNativeAuthenticator - -if ENABLE_OIDC_AUTH == "true": - # Use Generic OAuth with Keycloak - c.JupyterHub.authenticator_class = GenericOAuthenticator - - # Automatically redirect to OAuth provider (skip login button) - c.Authenticator.auto_login = True - - # Keycloak configuration - c.GenericOAuthenticator.client_id = os.environ.get("JUPYTERHUB_OAUTH_CLIENT_ID", "cogstack-jupyterhub") - c.GenericOAuthenticator.client_secret = os.environ.get("JUPYTERHUB_OAUTH_CLIENT_SECRET", "") - c.GenericOAuthenticator.oauth_callback_url = os.environ.get( - "JUPYTERHUB_OAUTH_CALLBACK_URL", - "https://localhost:8888/hub/oauth_callback" - ) - - # Keycloak endpoints - # Browser-accessible URL - keycloak_url_public = os.environ.get("JUPYTERHUB_KEYCLOAK_URL_PUBLIC", "http://keycloak.cogstack.localhost") - # Internal container URL (for backend token exchange) - keycloak_url_internal = os.environ.get("JUPYTERHUB_KEYCLOAK_URL_INTERNAL", "http://keycloak:8080") - realm = os.environ.get("JUPYTERHUB_KEYCLOAK_REALM", "cogstack-realm") - - # authorize_url is accessed by the browser, so use public URL - c.GenericOAuthenticator.authorize_url = f"{keycloak_url_public}/realms/{realm}/protocol/openid-connect/auth" - # token_url and userdata_url are accessed by JupyterHub backend, so use internal URL - c.GenericOAuthenticator.token_url = f"{keycloak_url_internal}/realms/{realm}/protocol/openid-connect/token" - c.GenericOAuthenticator.userdata_url = f"{keycloak_url_internal}/realms/{realm}/protocol/openid-connect/userinfo" - - c.GenericOAuthenticator.username_claim = "preferred_username" - - # Require users to be in specific Keycloak groups - c.GenericOAuthenticator.manage_groups = True - c.GenericOAuthenticator.allowed_groups = ["jupyterhub-users", "juypterhub-admins"] - c.GenericOAuthenticator.claim_groups_key = "groups" - - # Map Keycloak roles to JupyterHub admin - c.GenericOAuthenticator.admin_groups = ["jupyterhub-admins"] - - c.GenericOAuthenticator.scope = ["openid", "profile", "email", "groups"] - - # Allow all authenticated users (or restrict with allowed_groups above) - # c.GenericOAuthenticator.allow_all = True -else: - c.FirstUseAuthenticator.create_users = True - c.JupyterHub.authenticator_class = "firstuseauthenticator.FirstUseAuthenticator" - -# User containers will access hub by container name on the Docker network -c.JupyterHub.ip = "0.0.0.0" -c.JupyterHub.hub_ip = "0.0.0.0" -c.JupyterHub.hub_connect_ip = HUB_CONTAINER_IP_OR_NAME - -jupyter_hub_port = int(os.environ.get("JUPYTERHUB_INTERNAL_PORT", 8888)) -jupyter_hub_proxy_api_port = int(os.environ.get("JUPYTERHUB_INTERNAL_PROXY_API_PORT", 8887)) -jupyter_hub_ssl_port = int(os.environ.get("JUPYTERHUB_SSL_PORT", 443)) -jupyter_hub_proxy_url = str(os.environ.get("JUPYTERHUB_PROXY_API_URL", "http://127.0.0.1:")) - -c.ConfigurableHTTPProxy.api_url = jupyter_hub_proxy_url + str(jupyter_hub_proxy_api_port) -# c.JupyterHub.hub_connect_url = f"https://{HUB_CONTAINER_IP_OR_NAME}:{jupyter_hub_ssl_port}" -# c.DockerSpawner.hub_connect_url = c.JupyterHub.hub_connect_url - -# ideally a private network address -# c.JupyterHub.proxy_api_ip = "10.0.1.4" -# c.JupyterHub.proxy_api_port = jupyter_hub_proxy_api_port - -# TLS config -c.JupyterHub.port = jupyter_hub_ssl_port -c.JupyterHub.ssl_key = os.environ.get("JUPYTERHUB_SSL_KEY", "/srv/jupyterhub/security/nifi.key") -c.JupyterHub.ssl_cert = os.environ.get("JUPYTERHUB_SSL_CERT", "/srv/jupyterhub/security/nifi.pem") - -# Persist hub data on volume mounted inside container -data_dir = os.environ.get("JUPYTERHUB_DATA_VOLUME_CONTAINER", "") - -c.JupyterHub.cookie_secret_file = data_dir + "jupyterhub_cookie_secret" - -c.JupyterHub.services = [] - -if NOTEBOOK_IDLE_TIMEOUT > 0: - c.JupyterHub.services.append({ - "name": "idle-culler", - "admin": True, - "command": [ - sys.executable, - "-m", "jupyterhub_idle_culler", - f"--timeout={NOTEBOOK_IDLE_TIMEOUT}", - "--url=http://127.0.0.1:8081/hub/api", - ], - }) - -#------------------------------------------------------------------------------ -# Application(SingletonConfigurable) configuration -#------------------------------------------------------------------------------ -# This is an application. - -c.JupyterHub.pid_file = "/srv/jupyterhub/jupyter_hub.pid" -c.ConfigurableHTTPProxy.pid_file = "/srv/jupyterhub/jupyter_hub_proxy.pid" - -# The date format used by logging formatters for %(asctime)s -# Default: "%Y-%m-%d %H:%M:%S" -# c.Application.log_datefmt = "%Y-%m-%d %H:%M:%S" - -# The Logging format template -# Default: "[%(name)s]%(highlevel)s %(message)s" -# c.Application.log_format = "[%(name)s]%(highlevel)s %(message)s" - -jupyter_log_level = os.environ.get("JUPYTERHUB_LOG_LEVEL", "INFO") - -# Set the log level by value or name. -# Choices: any of [0, 10, 20, 30, 40, 50, "DEBUG", "INFO", "WARN", "ERROR", "CRITICAL"] -# Default: INFO -c.Application.log_level = jupyter_log_level - -# Instead of starting the Application, dump configuration to stdout -# Default: False -# c.Application.show_config = False - -# Instead of starting the Application, dump configuration to stdout (as JSON) -# Default: False -# c.Application.show_config_json = False - -# Let"s start with the least privilege, especially on a single host having limited resources -c.JupyterHub.allow_named_servers = False - -# Timeout (in seconds) to wait for spawners to initialize -# -# Checking if spawners are healthy can take a long time if many spawners are -# active at hub start time. -# -# If it takes longer than this timeout to check, init_spawner will be left to -# complete in the background and the http server is allowed to start. -# -# A timeout of -1 means wait forever, which can mean a slow startup of the Hub -# but ensures that the Hub is fully consistent by the time it starts responding -# to requests. This matches the behavior of jupyterhub 1.0. -# -# .. versionadded: 1.1.0 -# Default: 10 -c.JupyterHub.init_spawners_timeout = 720 - -# Timeout (in seconds) before giving up on a spawned HTTP server -# -# Once a server has successfully been spawned, this is the amount of time we -# wait before assuming that the server is unable to accept connections. -# Default: 30 -c.Spawner.http_timeout = 720 - -# Timeout (in seconds) before giving up on starting of single-user server. -# -# This is the timeout for start to return, not the timeout for the server to -# respond. Callers of spawner.start will assume that startup has failed if it -# takes longer than this. start should return when the server process is started -# and its location is known. -# Default: 60 -c.Spawner.start_timeout = 720 - - -#------------------------------------------------------------------------------ -# LocalProcessSpawner configuration -#------------------------------------------------------------------------------ - -# A Spawner that just uses Popen to start local processes as users. -# -# Requires users to exist on the local system. -# -# This is the default spawner for JupyterHub. - -# Seconds to wait for process to halt after SIGINT before proceeding to SIGTERM -c.LocalProcessSpawner.interrupt_timeout = 120 - -# Seconds to wait for process to halt after SIGKILL before giving up -c.LocalProcessSpawner.kill_timeout = 120 - -# Seconds to wait for process to halt after SIGTERM before proceeding to SIGKILL -c.LocalProcessSpawner.term_timeout = 120 diff --git a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/files/config/jupyterhub_cookie_secret b/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/files/config/jupyterhub_cookie_secret deleted file mode 100644 index de06abd0..00000000 --- a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/files/config/jupyterhub_cookie_secret +++ /dev/null @@ -1 +0,0 @@ -e91801df470c99061e3272f058a3ecb79b0e852cc3181069c8d333fc4d749394 diff --git a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/files/config/teamlist b/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/files/config/teamlist deleted file mode 100755 index bfbfa72c..00000000 --- a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/files/config/teamlist +++ /dev/null @@ -1 +0,0 @@ -cogstack_sharing admin cogstack_user \ No newline at end of file diff --git a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/files/config/userlist b/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/files/config/userlist deleted file mode 100755 index 364a6e51..00000000 --- a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/files/config/userlist +++ /dev/null @@ -1,2 +0,0 @@ -admin admin -cogstack_user \ No newline at end of file diff --git a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/NOTES.txt b/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/NOTES.txt deleted file mode 100644 index 4ca6415e..00000000 --- a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/NOTES.txt +++ /dev/null @@ -1,22 +0,0 @@ -CogStack JupyterHub has been deployed. - -Service name: - {{ include "cogstack-jupyterhub.fullname" . }} - -Port forward: - kubectl -n {{ .Release.Namespace }} port-forward svc/{{ include "cogstack-jupyterhub.fullname" . }} 8888:{{ .Values.service.port }} - -Recommended install command to use repository env/config files directly: - helm upgrade --install {{ .Release.Name }} {{ .Chart.Name }} \ - --namespace {{ .Release.Namespace }} --create-namespace \ - --set envFiles.useBundled=false \ - --set hubFiles.useBundled=false \ - --set securityFiles.useBundled=false \ - --set-file envFiles.jupyter=env/jupyter.env \ - --set-file envFiles.general=env/general.env \ - --set-file hubFiles.jupyterhubConfig=config/jupyterhub_config.py \ - --set-file hubFiles.userlist=config/userlist \ - --set-file hubFiles.teamlist=config/teamlist \ - --set-file securityFiles.cookieSecret=config/jupyterhub_cookie_secret \ - --set-file securityFiles.tlsKey=security/nifi.key \ - --set-file securityFiles.tlsCert=security/nifi.pem diff --git a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/_helpers.tpl b/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/_helpers.tpl deleted file mode 100644 index 00f8b68d..00000000 --- a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/_helpers.tpl +++ /dev/null @@ -1,59 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{- define "cogstack-jupyterhub.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "cogstack-jupyterhub.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{- define "cogstack-jupyterhub.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{- define "cogstack-jupyterhub.labels" -}} -helm.sh/chart: {{ include "cogstack-jupyterhub.chart" . }} -{{ include "cogstack-jupyterhub.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end -}} - -{{- define "cogstack-jupyterhub.selectorLabels" -}} -app.kubernetes.io/name: {{ include "cogstack-jupyterhub.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end -}} - -{{- define "cogstack-jupyterhub.serviceAccountName" -}} -{{- if .Values.serviceAccount.create -}} -{{- default (include "cogstack-jupyterhub.fullname" .) .Values.serviceAccount.name -}} -{{- else -}} -{{- default "default" .Values.serviceAccount.name -}} -{{- end -}} -{{- end -}} - -{{- define "cogstack-jupyterhub.envConfigMapName" -}} -{{- printf "%s-env-files" (include "cogstack-jupyterhub.fullname" .) -}} -{{- end -}} - -{{- define "cogstack-jupyterhub.hubConfigMapName" -}} -{{- printf "%s-hub-config" (include "cogstack-jupyterhub.fullname" .) -}} -{{- end -}} - -{{- define "cogstack-jupyterhub.secretName" -}} -{{- if .Values.securityFiles.existingSecret -}} -{{- .Values.securityFiles.existingSecret -}} -{{- else -}} -{{- printf "%s-hub-secrets" (include "cogstack-jupyterhub.fullname" .) -}} -{{- end -}} -{{- end -}} diff --git a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/configmap-env-files.yaml b/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/configmap-env-files.yaml deleted file mode 100644 index 5c7872c6..00000000 --- a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/configmap-env-files.yaml +++ /dev/null @@ -1,26 +0,0 @@ -{{- if and (not .Values.envFiles.useBundled) (eq (trim .Values.envFiles.jupyter) "") }} -{{- fail "envFiles.jupyter is required when envFiles.useBundled=false" }} -{{- end }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "cogstack-jupyterhub.envConfigMapName" . }} - labels: - {{- include "cogstack-jupyterhub.labels" . | nindent 4 }} -data: - general.env: | -{{- if ne (trim .Values.envFiles.general) "" }} -{{- .Values.envFiles.general | nindent 4 }} -{{- else if .Values.envFiles.useBundled }} -{{- .Files.Get "files/env/general.env" | nindent 4 }} -{{- else }} - # optional -{{- end }} - jupyter.env: | -{{- if ne (trim .Values.envFiles.jupyter) "" }} -{{- .Values.envFiles.jupyter | nindent 4 }} -{{- else if .Values.envFiles.useBundled }} -{{- .Files.Get "files/env/jupyter.env" | nindent 4 }} -{{- else }} - # required when useBundled=false -{{- end }} diff --git a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/configmap-hub-files.yaml b/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/configmap-hub-files.yaml deleted file mode 100644 index ee42054d..00000000 --- a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/configmap-hub-files.yaml +++ /dev/null @@ -1,34 +0,0 @@ -{{- if and (not .Values.hubFiles.useBundled) (eq (trim .Values.hubFiles.jupyterhubConfig) "") }} -{{- fail "hubFiles.jupyterhubConfig is required when hubFiles.useBundled=false" }} -{{- end }} -{{- if and (not .Values.hubFiles.useBundled) (eq (trim .Values.hubFiles.userlist) "") }} -{{- fail "hubFiles.userlist is required when hubFiles.useBundled=false" }} -{{- end }} -{{- if and (not .Values.hubFiles.useBundled) (eq (trim .Values.hubFiles.teamlist) "") }} -{{- fail "hubFiles.teamlist is required when hubFiles.useBundled=false" }} -{{- end }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "cogstack-jupyterhub.hubConfigMapName" . }} - labels: - {{- include "cogstack-jupyterhub.labels" . | nindent 4 }} -data: - jupyterhub_config.py: | -{{- if ne (trim .Values.hubFiles.jupyterhubConfig) "" }} -{{- .Values.hubFiles.jupyterhubConfig | nindent 4 }} -{{- else }} -{{- .Files.Get "files/config/jupyterhub_config.py" | nindent 4 }} -{{- end }} - userlist: | -{{- if ne (trim .Values.hubFiles.userlist) "" }} -{{- .Values.hubFiles.userlist | nindent 4 }} -{{- else }} -{{- .Files.Get "files/config/userlist" | nindent 4 }} -{{- end }} - teamlist: | -{{- if ne (trim .Values.hubFiles.teamlist) "" }} -{{- .Values.hubFiles.teamlist | nindent 4 }} -{{- else }} -{{- .Files.Get "files/config/teamlist" | nindent 4 }} -{{- end }} diff --git a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/deployment.yaml b/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/deployment.yaml deleted file mode 100644 index 22c00538..00000000 --- a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/deployment.yaml +++ /dev/null @@ -1,152 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "cogstack-jupyterhub.fullname" . }} - labels: - {{- include "cogstack-jupyterhub.labels" . | nindent 4 }} -spec: - replicas: {{ .Values.replicaCount }} - selector: - matchLabels: - {{- include "cogstack-jupyterhub.selectorLabels" . | nindent 6 }} - template: - metadata: - labels: - {{- include "cogstack-jupyterhub.selectorLabels" . | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - annotations: - checksum/env-files: {{ include (print $.Template.BasePath "/configmap-env-files.yaml") . | sha256sum }} - checksum/hub-files: {{ include (print $.Template.BasePath "/configmap-hub-files.yaml") . | sha256sum }} - checksum/hub-secret: {{ include (print $.Template.BasePath "/secret-hub-files.yaml") . | sha256sum }} - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ include "cogstack-jupyterhub.serviceAccountName" . }} - {{- with .Values.podSecurityContext }} - securityContext: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - containers: - - name: hub - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - {{- with .Values.securityContext }} - securityContext: - {{- toYaml . | nindent 12 }} - {{- end }} - command: - - {{ .Values.runtime.shell | quote }} - - -lc - args: - - | - set -eo pipefail - if [ -f /etc/cogstack/env/general.env ]; then - set -a - source /etc/cogstack/env/general.env - set +a - fi - if [ -f /etc/cogstack/env/jupyter.env ]; then - set -a - source /etc/cogstack/env/jupyter.env - set +a - fi - exec {{ .Values.runtime.command }} -f {{ .Values.runtime.configPath }} - ports: - - name: https - containerPort: {{ .Values.service.targetPort }} - protocol: TCP - {{- $extraEnv := .Values.extraEnv | default (dict) }} - {{- if gt (len $extraEnv) 0 }} - env: - {{- range $key := keys $extraEnv | sortAlpha }} - - name: {{ $key }} - value: {{ index $extraEnv $key | quote }} - {{- end }} - {{- end }} - volumeMounts: - - name: env-files - mountPath: /etc/cogstack/env - readOnly: true - - name: hub-config - mountPath: /srv/jupyterhub/jupyterhub_config.py - subPath: jupyterhub_config.py - readOnly: true - - name: hub-config - mountPath: /srv/jupyterhub/userlist - subPath: userlist - readOnly: true - - name: hub-config - mountPath: /srv/jupyterhub/teamlist - subPath: teamlist - readOnly: true - - name: hub-secret - mountPath: /srv/jupyterhub/security - readOnly: true - - name: hub-secret - mountPath: /srv/jupyterhub/jupyterhub_cookie_secret - subPath: jupyterhub_cookie_secret - readOnly: true - - name: hub-data - mountPath: /srv/jupyterhub - - name: shared-scratch - mountPath: /home/jovyan/scratch - {{- if .Values.dockerSocket.enabled }} - - name: docker-socket - mountPath: /var/run/docker.sock - {{- end }} - {{- with .Values.resources }} - resources: - {{- toYaml . | nindent 12 }} - {{- end }} - volumes: - - name: env-files - configMap: - name: {{ include "cogstack-jupyterhub.envConfigMapName" . }} - defaultMode: 0444 - - name: hub-config - configMap: - name: {{ include "cogstack-jupyterhub.hubConfigMapName" . }} - defaultMode: 0444 - - name: hub-secret - secret: - secretName: {{ include "cogstack-jupyterhub.secretName" . }} - defaultMode: 0400 - - name: hub-data - {{- if .Values.persistence.hub.enabled }} - persistentVolumeClaim: - claimName: {{ default (printf "%s-hub" (include "cogstack-jupyterhub.fullname" .)) .Values.persistence.hub.existingClaim }} - {{- else }} - emptyDir: {} - {{- end }} - - name: shared-scratch - {{- if .Values.persistence.scratch.enabled }} - persistentVolumeClaim: - claimName: {{ default (printf "%s-scratch" (include "cogstack-jupyterhub.fullname" .)) .Values.persistence.scratch.existingClaim }} - {{- else }} - emptyDir: {} - {{- end }} - {{- if .Values.dockerSocket.enabled }} - - name: docker-socket - hostPath: - path: {{ .Values.dockerSocket.hostPath }} - type: Socket - {{- end }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/ingress.yaml b/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/ingress.yaml deleted file mode 100644 index 4179244f..00000000 --- a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/ingress.yaml +++ /dev/null @@ -1,35 +0,0 @@ -{{- if .Values.ingress.enabled -}} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: {{ include "cogstack-jupyterhub.fullname" . }} - labels: - {{- include "cogstack-jupyterhub.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if .Values.ingress.className }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- with .Values.ingress.tls }} - tls: - {{- toYaml . | nindent 4 }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - pathType: {{ .pathType }} - backend: - service: - name: {{ include "cogstack-jupyterhub.fullname" $ }} - port: - number: {{ $.Values.service.port }} - {{- end }} - {{- end }} -{{- end }} diff --git a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/pvc-hub.yaml b/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/pvc-hub.yaml deleted file mode 100644 index bb0a2463..00000000 --- a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/pvc-hub.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if and .Values.persistence.hub.enabled (not .Values.persistence.hub.existingClaim) }} -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: {{ include "cogstack-jupyterhub.fullname" . }}-hub - labels: - {{- include "cogstack-jupyterhub.labels" . | nindent 4 }} -spec: - accessModes: - {{- toYaml .Values.persistence.hub.accessModes | nindent 4 }} - {{- if .Values.persistence.hub.storageClassName }} - storageClassName: {{ .Values.persistence.hub.storageClassName | quote }} - {{- end }} - resources: - requests: - storage: {{ .Values.persistence.hub.size | quote }} -{{- end }} diff --git a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/pvc-scratch.yaml b/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/pvc-scratch.yaml deleted file mode 100644 index a7666cd6..00000000 --- a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/pvc-scratch.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if and .Values.persistence.scratch.enabled (not .Values.persistence.scratch.existingClaim) }} -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: {{ include "cogstack-jupyterhub.fullname" . }}-scratch - labels: - {{- include "cogstack-jupyterhub.labels" . | nindent 4 }} -spec: - accessModes: - {{- toYaml .Values.persistence.scratch.accessModes | nindent 4 }} - {{- if .Values.persistence.scratch.storageClassName }} - storageClassName: {{ .Values.persistence.scratch.storageClassName | quote }} - {{- end }} - resources: - requests: - storage: {{ .Values.persistence.scratch.size | quote }} -{{- end }} diff --git a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/secret-hub-files.yaml b/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/secret-hub-files.yaml deleted file mode 100644 index b3bcae47..00000000 --- a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/secret-hub-files.yaml +++ /dev/null @@ -1,37 +0,0 @@ -{{- if not .Values.securityFiles.existingSecret }} -{{- if and (not .Values.securityFiles.useBundled) (eq (trim .Values.securityFiles.cookieSecret) "") }} -{{- fail "securityFiles.cookieSecret is required when securityFiles.useBundled=false and no existingSecret is set" }} -{{- end }} -{{- if and (not .Values.securityFiles.useBundled) (eq (trim .Values.securityFiles.tlsKey) "") }} -{{- fail "securityFiles.tlsKey is required when securityFiles.useBundled=false and no existingSecret is set" }} -{{- end }} -{{- if and (not .Values.securityFiles.useBundled) (eq (trim .Values.securityFiles.tlsCert) "") }} -{{- fail "securityFiles.tlsCert is required when securityFiles.useBundled=false and no existingSecret is set" }} -{{- end }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "cogstack-jupyterhub.secretName" . }} - labels: - {{- include "cogstack-jupyterhub.labels" . | nindent 4 }} -type: Opaque -stringData: - jupyterhub_cookie_secret: | -{{- if ne (trim .Values.securityFiles.cookieSecret) "" }} -{{- .Values.securityFiles.cookieSecret | nindent 4 }} -{{- else }} -{{- .Files.Get "files/config/jupyterhub_cookie_secret" | nindent 4 }} -{{- end }} - nifi.key: | -{{- if ne (trim .Values.securityFiles.tlsKey) "" }} -{{- .Values.securityFiles.tlsKey | nindent 4 }} -{{- else }} -{{- .Files.Get "files/security/nifi.key" | nindent 4 }} -{{- end }} - nifi.pem: | -{{- if ne (trim .Values.securityFiles.tlsCert) "" }} -{{- .Values.securityFiles.tlsCert | nindent 4 }} -{{- else }} -{{- .Files.Get "files/security/nifi.pem" | nindent 4 }} -{{- end }} -{{- end }} diff --git a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/service.yaml b/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/service.yaml deleted file mode 100644 index e7e135b4..00000000 --- a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/service.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "cogstack-jupyterhub.fullname" . }} - labels: - {{- include "cogstack-jupyterhub.labels" . | nindent 4 }} - {{- with .Values.service.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - type: {{ .Values.service.type }} - selector: - {{- include "cogstack-jupyterhub.selectorLabels" . | nindent 4 }} - ports: - - name: https - port: {{ .Values.service.port }} - targetPort: {{ .Values.service.targetPort }} - protocol: TCP diff --git a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/serviceaccount.yaml b/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/serviceaccount.yaml deleted file mode 100644 index 94b59f79..00000000 --- a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/templates/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.serviceAccount.create }} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "cogstack-jupyterhub.serviceAccountName" . }} - labels: - {{- include "cogstack-jupyterhub.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/values.yaml b/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/values.yaml deleted file mode 100644 index 859a75d7..00000000 --- a/apps/cogstack-jupyter-hub/charts/cogstack-jupyterhub/values.yaml +++ /dev/null @@ -1,90 +0,0 @@ -replicaCount: 1 - -image: - repository: cogstacksystems/jupyter-hub - tag: "2.2.3" - pullPolicy: IfNotPresent - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - create: false - annotations: {} - name: "" - -podAnnotations: {} -podLabels: {} -podSecurityContext: {} -securityContext: - runAsUser: 0 - runAsGroup: 0 - -resources: {} - -nodeSelector: {} -tolerations: [] -affinity: {} - -extraEnv: {} - -service: - type: ClusterIP - port: 8888 - targetPort: 443 - annotations: {} - -ingress: - enabled: false - className: "" - annotations: {} - hosts: - - host: jupyterhub.local - paths: - - path: / - pathType: Prefix - tls: [] - -persistence: - hub: - enabled: true - existingClaim: "" - storageClassName: "" - accessModes: - - ReadWriteOnce - size: 10Gi - scratch: - enabled: true - existingClaim: "" - storageClassName: "" - accessModes: - - ReadWriteOnce - size: 10Gi - -dockerSocket: - enabled: true - hostPath: /var/run/docker.sock - -envFiles: - useBundled: true - general: "" - jupyter: "" - -hubFiles: - useBundled: true - jupyterhubConfig: "" - userlist: "" - teamlist: "" - -securityFiles: - useBundled: true - existingSecret: "" - cookieSecret: "" - tlsKey: "" - tlsCert: "" - -runtime: - shell: /bin/bash - command: jupyterhub - configPath: /srv/jupyterhub/jupyterhub_config.py diff --git a/apps/ocr-service/charts/ocr-service/.helmignore b/apps/ocr-service/charts/ocr-service/.helmignore deleted file mode 100644 index 8d8e609d..00000000 --- a/apps/ocr-service/charts/ocr-service/.helmignore +++ /dev/null @@ -1,4 +0,0 @@ -# Patterns to ignore when building packages. -.DS_Store -.git/ -.gitignore diff --git a/apps/ocr-service/charts/ocr-service/Chart.yaml b/apps/ocr-service/charts/ocr-service/Chart.yaml deleted file mode 100644 index 9e491fe8..00000000 --- a/apps/ocr-service/charts/ocr-service/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v2 -name: ocr-service -description: Helm chart for deploying the CogStack OCR service -type: application -version: 0.2.0 -appVersion: "1.0.9" diff --git a/apps/ocr-service/charts/ocr-service/README.md b/apps/ocr-service/charts/ocr-service/README.md deleted file mode 100644 index fd5854ac..00000000 --- a/apps/ocr-service/charts/ocr-service/README.md +++ /dev/null @@ -1,82 +0,0 @@ -# ocr-service Helm Chart - -Deploys the CogStack OCR service as a Kubernetes `Deployment` + `Service`, with optional `HorizontalPodAutoscaler` (HPA). - -## Install - -```bash -helm install ocr-service ./charts/ocr-service -``` - -Repo shortcut: - -```bash -make helm-install -``` - -### Install with values overlays - -```bash -helm upgrade --install ocr-service ./charts/ocr-service \ - -f ./my-values.yaml -``` - -Text-only profile: - -```bash -helm upgrade --install ocr-service ./charts/ocr-service \ - -f ./charts/ocr-service/values-text-only.yaml -``` - -Repo shortcut: - -```bash -make helm-install-text-only -``` - -Notes: -- Use normal Helm value layering; later `-f` files override earlier ones. -- Put runtime OCR settings under `env`. -- For existing Kubernetes-managed env sources, use `extraEnvFrom` with `secretRef` or `configMapRef`. -- The repo `env/*.env` files remain for local shell and Docker flows; the Helm chart now uses YAML values only. -- Use `HELM_ARGS` with the make targets for namespace or values overrides, for example `make helm-install HELM_ARGS='-n ocr --create-namespace'`. - -Example custom overlay: - -```yaml -image: - tag: "1.0.9" - -env: - OCR_SERVICE_TESSERACT_LANG: "eng" - OCR_SERVICE_CPU_THREADS: "1" - OCR_SERVICE_CONVERTER_THREADS: "1" -``` - -## Upgrade - -```bash -helm upgrade ocr-service ./charts/ocr-service -``` - -## Key values - -- `image.repository` / `image.tag`: container image to run. -- `env`: OCR service environment variables. -- `extraEnvFrom`: import additional env vars from a `Secret` or `ConfigMap`. -- `tmp.*`: writable `emptyDir` mount for `/ocr_service/tmp`. -- `probes.*`: startup/readiness/liveness probe settings. -- `autoscaling.enabled`: enable/disable HPA. - -## Enable HPA - -```yaml -autoscaling: - enabled: true - minReplicas: 2 - maxReplicas: 10 - targetCPUUtilizationPercentage: 75 - targetMemoryUtilizationPercentage: 80 -``` - -HPA requires Kubernetes metrics (usually `metrics-server`) in the cluster. diff --git a/apps/ocr-service/charts/ocr-service/templates/NOTES.txt b/apps/ocr-service/charts/ocr-service/templates/NOTES.txt deleted file mode 100644 index 853ee25c..00000000 --- a/apps/ocr-service/charts/ocr-service/templates/NOTES.txt +++ /dev/null @@ -1,7 +0,0 @@ -1. Get the application URL by running these commands: - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "ocr-service.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME {{ .Values.service.port }}:{{ .Values.service.targetPort }} - -2. Check health and readiness: - curl -sS http://127.0.0.1:{{ .Values.service.port }}/api/health - curl -sS http://127.0.0.1:{{ .Values.service.port }}/api/ready diff --git a/apps/ocr-service/charts/ocr-service/templates/_helpers.tpl b/apps/ocr-service/charts/ocr-service/templates/_helpers.tpl deleted file mode 100644 index 264ea879..00000000 --- a/apps/ocr-service/charts/ocr-service/templates/_helpers.tpl +++ /dev/null @@ -1,60 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "ocr-service.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -*/}} -{{- define "ocr-service.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "ocr-service.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels. -*/}} -{{- define "ocr-service.labels" -}} -helm.sh/chart: {{ include "ocr-service.chart" . }} -{{ include "ocr-service.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels. -*/}} -{{- define "ocr-service.selectorLabels" -}} -app.kubernetes.io/name: {{ include "ocr-service.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use. -*/}} -{{- define "ocr-service.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "ocr-service.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/apps/ocr-service/charts/ocr-service/templates/deployment.yaml b/apps/ocr-service/charts/ocr-service/templates/deployment.yaml deleted file mode 100644 index 1f83340c..00000000 --- a/apps/ocr-service/charts/ocr-service/templates/deployment.yaml +++ /dev/null @@ -1,117 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -{{- $env := .Values.env | default dict }} -metadata: - name: {{ include "ocr-service.fullname" . }} - labels: - {{- include "ocr-service.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "ocr-service.selectorLabels" . | nindent 6 }} - template: - metadata: - labels: - {{- include "ocr-service.selectorLabels" . | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ include "ocr-service.serviceAccountName" . }} - automountServiceAccountToken: {{ .Values.podAutomountServiceAccountToken }} - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ include "ocr-service.name" . }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - name: http - containerPort: {{ .Values.service.targetPort }} - protocol: TCP - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - {{- if or $env .Values.extraEnv }} - env: - {{- range $key := keys $env | sortAlpha }} - - name: {{ $key }} - value: {{ index $env $key | quote }} - {{- end }} - {{- with .Values.extraEnv }} - {{- toYaml . | nindent 12 }} - {{- end }} - {{- end }} - {{- with .Values.extraEnvFrom }} - envFrom: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- if .Values.probes.startup.enabled }} - startupProbe: - httpGet: - path: {{ .Values.probes.startup.path }} - port: http - periodSeconds: {{ .Values.probes.startup.periodSeconds }} - timeoutSeconds: {{ .Values.probes.startup.timeoutSeconds }} - failureThreshold: {{ .Values.probes.startup.failureThreshold }} - {{- end }} - {{- if .Values.probes.readiness.enabled }} - readinessProbe: - httpGet: - path: {{ .Values.probes.readiness.path }} - port: http - initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.readiness.periodSeconds }} - timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }} - failureThreshold: {{ .Values.probes.readiness.failureThreshold }} - {{- end }} - {{- if .Values.probes.liveness.enabled }} - livenessProbe: - httpGet: - path: {{ .Values.probes.liveness.path }} - port: http - initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.liveness.periodSeconds }} - timeoutSeconds: {{ .Values.probes.liveness.timeoutSeconds }} - failureThreshold: {{ .Values.probes.liveness.failureThreshold }} - {{- end }} - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- if .Values.tmp.enabled }} - volumeMounts: - - name: ocr-tmp - mountPath: {{ .Values.tmp.mountPath }} - {{- end }} - {{- if .Values.tmp.enabled }} - volumes: - - name: ocr-tmp - emptyDir: - {{- if .Values.tmp.emptyDir.medium }} - medium: {{ .Values.tmp.emptyDir.medium | quote }} - {{- end }} - {{- if .Values.tmp.emptyDir.sizeLimit }} - sizeLimit: {{ .Values.tmp.emptyDir.sizeLimit }} - {{- end }} - {{- end }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/apps/ocr-service/charts/ocr-service/templates/hpa.yaml b/apps/ocr-service/charts/ocr-service/templates/hpa.yaml deleted file mode 100644 index a50c356c..00000000 --- a/apps/ocr-service/charts/ocr-service/templates/hpa.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "ocr-service.fullname" . }} - labels: - {{- include "ocr-service.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "ocr-service.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/apps/ocr-service/charts/ocr-service/templates/service.yaml b/apps/ocr-service/charts/ocr-service/templates/service.yaml deleted file mode 100644 index 096f5de3..00000000 --- a/apps/ocr-service/charts/ocr-service/templates/service.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "ocr-service.fullname" . }} - labels: - {{- include "ocr-service.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} - selector: - {{- include "ocr-service.selectorLabels" . | nindent 4 }} - ports: - - name: http - port: {{ .Values.service.port }} - targetPort: {{ .Values.service.targetPort }} - protocol: TCP diff --git a/apps/ocr-service/charts/ocr-service/templates/serviceaccount.yaml b/apps/ocr-service/charts/ocr-service/templates/serviceaccount.yaml deleted file mode 100644 index e0831f57..00000000 --- a/apps/ocr-service/charts/ocr-service/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "ocr-service.serviceAccountName" . }} - labels: - {{- include "ocr-service.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -automountServiceAccountToken: {{ .Values.serviceAccount.automount }} -{{- end }} diff --git a/apps/ocr-service/charts/ocr-service/values-text-only.yaml b/apps/ocr-service/charts/ocr-service/values-text-only.yaml deleted file mode 100644 index c66edeae..00000000 --- a/apps/ocr-service/charts/ocr-service/values-text-only.yaml +++ /dev/null @@ -1,2 +0,0 @@ -env: - OCR_SERVICE_OPERATION_MODE: "NO_OCR" diff --git a/apps/ocr-service/charts/ocr-service/values.yaml b/apps/ocr-service/charts/ocr-service/values.yaml deleted file mode 100644 index f4341c05..00000000 --- a/apps/ocr-service/charts/ocr-service/values.yaml +++ /dev/null @@ -1,123 +0,0 @@ -replicaCount: 1 - -image: - repository: cogstacksystems/cogstack-ocr-service - tag: "1.0.9" - pullPolicy: IfNotPresent - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - create: false - automount: false - annotations: {} - name: "" - -podAutomountServiceAccountToken: false - -podAnnotations: {} -podLabels: {} - -podSecurityContext: - fsGroup: 10001 - fsGroupChangePolicy: OnRootMismatch - -securityContext: - runAsNonRoot: true - runAsUser: 10001 - runAsGroup: 10001 - allowPrivilegeEscalation: false - readOnlyRootFilesystem: false - capabilities: - drop: - - ALL - -service: - type: ClusterIP - port: 8090 - targetPort: 8090 - -resources: - limits: - cpu: "1" - memory: 1Gi - requests: - cpu: 500m - memory: 512Mi - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 5 - targetCPUUtilizationPercentage: 75 - targetMemoryUtilizationPercentage: 80 - -tmp: - enabled: true - mountPath: /ocr_service/tmp - emptyDir: - medium: "" - sizeLimit: 1Gi - -probes: - startup: - enabled: true - path: /api/ready - periodSeconds: 10 - timeoutSeconds: 5 - failureThreshold: 90 - readiness: - enabled: true - path: /api/ready - initialDelaySeconds: 20 - periodSeconds: 10 - timeoutSeconds: 5 - failureThreshold: 6 - liveness: - enabled: true - path: /api/health - initialDelaySeconds: 30 - periodSeconds: 30 - timeoutSeconds: 5 - failureThreshold: 3 - -env: - OCR_SERVICE_HOST: "0.0.0.0" - OCR_SERVICE_PORT: "8090" - OCR_SERVICE_WORKER_CLASS: "sync" - OCR_WEB_SERVICE_WORKERS: "1" - OCR_SERVICE_LOG_LEVEL: "20" - OCR_SERVICE_DEBUG_MODE: "false" - OCR_SERVICE_OPERATION_MODE: "OCR" - OCR_SERVICE_CPU_THREADS: "1" - OCR_SERVICE_CONVERTER_THREADS: "1" - OCR_SERVICE_TESSERACT_LANG: "eng" - OCR_SERVICE_TESSERACT_TIMEOUT: "30" - OCR_SERVICE_TESSERACT_NICE: "-18" - OCR_SERVICE_TESSERACT_CUSTOM_CONFIG_FLAGS: "" - OCR_SERVICE_IMAGE_DPI: "200" - OCR_SERVICE_LIBRE_OFFICE_PROCESS_TIMEOUT: "20" - OCR_SERVICE_GUNICORN_LOG_FILE_PATH: "-" - OCR_SERVICE_GUNICORN_LOG_LEVEL: "info" - OCR_SERVICE_GUNICORN_MAX_REQUESTS_JITTER: "5000" - OCR_SERVICE_GUNICORN_MAX_REQUESTS: "50000" - OCR_SERVICE_GUNICORN_TIMEOUT: "300" - OCR_SERVICE_GUNICORN_GRACEFUL_TIMEOUT: "30" - OCR_TMP_DIR: "/ocr_service/tmp" - OMP_THREAD_LIMIT: "1" - -# Prefer standard Helm values overlays instead of passing raw `.env` files. -# The repo `env/*.env` files are for local shell and Docker workflows, not Helm. -# Example: -# helm upgrade --install ocr-service ./charts/ocr-service \ -# -f ./charts/ocr-service/values-text-only.yaml \ -# -f ./my-values.yaml - -extraEnv: [] -extraEnvFrom: [] - -nodeSelector: {} -tolerations: [] -affinity: {} From 137b7736b84c9d327a37ab3702053a027d345dfa Mon Sep 17 00:00:00 2001 From: vladd-bit Date: Wed, 18 Nov 2026 11:16:40 +0000 Subject: [PATCH 2/4] Chore: moved dashboards demo to /apps folder. --- README.md | 2 +- apps/cogstack-dashboards-demo/.gitignore | 216 +++++++++++ apps/cogstack-dashboards-demo/LICENSE | 201 ++++++++++ apps/cogstack-dashboards-demo/README.md | 43 +++ apps/cogstack-dashboards-demo/data/.gitkeep | 0 .../figures/clusters.png | Bin 0 -> 798152 bytes .../figures/disorder_per_age.png | Bin 0 -> 120628 bytes .../figures/disorder_per_gender.png | Bin 0 -> 74136 bytes .../figures/handpicked_co_occurrences.png | Bin 0 -> 1059556 bytes .../figures/presence.png | Bin 0 -> 46876 bytes .../figures/subject.png | Bin 0 -> 39444 bytes .../cogstack-dashboards-demo/figures/time.png | Bin 0 -> 43748 bytes .../figures/top_level_concepts.png | Bin 0 -> 81414 bytes .../cogstack-dashboards-demo/requirements.txt | 11 + .../sample_access_scripts/python_os_access.py | 24 ++ .../sample_curl_command.sh | 10 + .../staging_scripts/co_occurence_generator.py | 209 +++++++++++ .../co_occurence_hand_selected.py | 160 ++++++++ .../staging_scripts/disorder_codes.py | 158 ++++++++ .../staging_scripts/disorders_per_age.py | 59 +++ .../staging_scripts/disorders_per_sex.py | 63 ++++ .../staging_scripts/patients_per_disorder.py | 186 +++++++++ .../staging_scripts/top_level_codes.py | 83 ++++ .../generate_meta_images.py | 69 ++++ .../visualisation_scripts/pca_co_occurence.py | 354 ++++++++++++++++++ .../vis_disorder_per_age.py | 68 ++++ .../vis_disorder_per_gender.py | 95 +++++ .../visualisation_scripts/vis_top_codes.py | 71 ++++ .../visualise_co_occurence.py | 143 +++++++ docs/docs/cogstack-ce/reference.md | 2 +- 30 files changed, 2225 insertions(+), 2 deletions(-) create mode 100644 apps/cogstack-dashboards-demo/.gitignore create mode 100644 apps/cogstack-dashboards-demo/LICENSE create mode 100644 apps/cogstack-dashboards-demo/README.md create mode 100644 apps/cogstack-dashboards-demo/data/.gitkeep create mode 100644 apps/cogstack-dashboards-demo/figures/clusters.png create mode 100644 apps/cogstack-dashboards-demo/figures/disorder_per_age.png create mode 100644 apps/cogstack-dashboards-demo/figures/disorder_per_gender.png create mode 100644 apps/cogstack-dashboards-demo/figures/handpicked_co_occurrences.png create mode 100644 apps/cogstack-dashboards-demo/figures/presence.png create mode 100644 apps/cogstack-dashboards-demo/figures/subject.png create mode 100644 apps/cogstack-dashboards-demo/figures/time.png create mode 100644 apps/cogstack-dashboards-demo/figures/top_level_concepts.png create mode 100644 apps/cogstack-dashboards-demo/requirements.txt create mode 100644 apps/cogstack-dashboards-demo/sample_access_scripts/python_os_access.py create mode 100644 apps/cogstack-dashboards-demo/sample_access_scripts/sample_curl_command.sh create mode 100644 apps/cogstack-dashboards-demo/staging_scripts/co_occurence_generator.py create mode 100644 apps/cogstack-dashboards-demo/staging_scripts/co_occurence_hand_selected.py create mode 100644 apps/cogstack-dashboards-demo/staging_scripts/disorder_codes.py create mode 100644 apps/cogstack-dashboards-demo/staging_scripts/disorders_per_age.py create mode 100644 apps/cogstack-dashboards-demo/staging_scripts/disorders_per_sex.py create mode 100644 apps/cogstack-dashboards-demo/staging_scripts/patients_per_disorder.py create mode 100644 apps/cogstack-dashboards-demo/staging_scripts/top_level_codes.py create mode 100644 apps/cogstack-dashboards-demo/visualisation_scripts/generate_meta_images.py create mode 100644 apps/cogstack-dashboards-demo/visualisation_scripts/pca_co_occurence.py create mode 100644 apps/cogstack-dashboards-demo/visualisation_scripts/vis_disorder_per_age.py create mode 100644 apps/cogstack-dashboards-demo/visualisation_scripts/vis_disorder_per_gender.py create mode 100644 apps/cogstack-dashboards-demo/visualisation_scripts/vis_top_codes.py create mode 100644 apps/cogstack-dashboards-demo/visualisation_scripts/visualise_co_occurence.py diff --git a/README.md b/README.md index ef3b2422..24604519 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ See the latest documentation on [Readthedocs](https://docs.cogstack.org/en/lates Cohort definition tooling with NL2DSL and web UI - + CogStack Dashboards Demo
CogStack Dashboards Demo
diff --git a/apps/cogstack-dashboards-demo/.gitignore b/apps/cogstack-dashboards-demo/.gitignore new file mode 100644 index 00000000..c02e6c3e --- /dev/null +++ b/apps/cogstack-dashboards-demo/.gitignore @@ -0,0 +1,216 @@ +# Personal ignore rules +# Ignore all files inside data folders +data/* + +# But keep the placeholder files for folders +!data/.gitkeep +!data/co_occurrences/.gitkeep +!data/SNOMED/.gitkeep + +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[codz] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py.cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# UV +# Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +#uv.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock +#poetry.toml + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +# pdm recommends including project-wide configuration in pdm.toml, but excluding .pdm-python. +# https://pdm-project.org/en/latest/usage/project/#working-with-version-control +#pdm.lock +#pdm.toml +.pdm-python +.pdm-build/ + +# pixi +# Similar to Pipfile.lock, it is generally recommended to include pixi.lock in version control. +#pixi.lock +# Pixi creates a virtual environment in the .pixi directory, just like venv module creates one +# in the .venv directory. It is recommended not to include this directory in version control. +.pixi + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.envrc +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ + +# Abstra +# Abstra is an AI-powered process automation framework. +# Ignore directories containing user credentials, local state, and settings. +# Learn more at https://abstra.io/docs +.abstra/ + +# Visual Studio Code +# Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore +# that can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore +# and can be added to the global gitignore or merged into this file. However, if you prefer, +# you could uncomment the following to ignore the entire vscode folder +# .vscode/ + +# Ruff stuff: +.ruff_cache/ + +# PyPI configuration file +.pypirc + +# Cursor +# Cursor is an AI-powered code editor. `.cursorignore` specifies files/directories to +# exclude from AI features like autocomplete and code analysis. Recommended for sensitive data +# refer to https://docs.cursor.com/context/ignore-files +.cursorignore +.cursorindexingignore + +# Marimo +marimo/_static/ +marimo/_lsp/ +__marimo__/ diff --git a/apps/cogstack-dashboards-demo/LICENSE b/apps/cogstack-dashboards-demo/LICENSE new file mode 100644 index 00000000..261eeb9e --- /dev/null +++ b/apps/cogstack-dashboards-demo/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/apps/cogstack-dashboards-demo/README.md b/apps/cogstack-dashboards-demo/README.md new file mode 100644 index 00000000..e41d5f54 --- /dev/null +++ b/apps/cogstack-dashboards-demo/README.md @@ -0,0 +1,43 @@ +# CogStack Dashboards Demo Scripts + +This repository demonstrates figures created by data stored in [CogStackDashboards](https://www.cogstackdashboards.sites.er.kcl.ac.uk). + +This repo is intended to be a guide on how to access the dashboards and includes example scripts that can be used to gain clinical insights from the MIMIC-IV dataset. Along with additional capacity for querying annotations via `discharge_annotations` and `radiology_annotations`. +``` +├── data/ +│ ├── co_occurrences/ - Co-occurrence information for SNOMED CT concepts +│ └── SNOMED/ - Required SNOMED CT Files, See below +├── figures/ - Images used in the paper and generated from scripts +├── sample_access_scripts/ - Simple demo scripts showing how to request data via curl or Python +├── staging_scripts/ - Staging scripts to save data from CogstackDashboards in local files +├── visualisation_scripts/ - Scripts used to generate images used in the paper +└── README.md +``` +## Access: + +1. Sign up for a [PhysioNet account](https://physionet.org/register/) +2. Complete [training](https://physionet.org/settings/training/) and obtain [credentialed status](https://physionet.org/settings/credentialing/) +3. Log into [CogStackDashboards](https://www.cogstackdashboards.sites.er.kcl.ac.uk) with your PhysioNet account +4. For API access, see sample_access_scripts for examples of how to create appropriate queries + +# Prerequisite: SNOMED CT Required Files + +SNOMED CT is required for resolving higher-level ancestors of top-level nodes and translating SNOMED codes into human-readable names. + +## International SNOMED CT Downloads + +https://www.nlm.nih.gov/healthit/snomedct/international.html + +## UK SNOMED CT Downloads + +https://isd.digital.nhs.uk/trud/users/guest/filters/0/home + +After downloading, extract the following two files from the ontology package. They follow this naming convention: + +- `sct2_Description_Full-en_INT_YYYYMMDD.txt` +- `sct2_Relationship_Full_INT_YYYYMMDD.txt` + +Save them in `data/SNOMED/` as: + +- `sct2_description.txt` +- `sct2_relationship.txt` \ No newline at end of file diff --git a/apps/cogstack-dashboards-demo/data/.gitkeep b/apps/cogstack-dashboards-demo/data/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/apps/cogstack-dashboards-demo/figures/clusters.png b/apps/cogstack-dashboards-demo/figures/clusters.png new file mode 100644 index 0000000000000000000000000000000000000000..c9ebfe1b13e0ea26acc97035bc32a2bd6e0b8ac4 GIT binary patch literal 798152 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