Remove references to legacy JupyterHub

Author: mmwinther

src/dapla_metadata/_shared/config.py

@@ -67,11 +67,6 @@ def get_config_item(item: str, *, raising: bool = False) -> str | None:
     return value
 
 
-def get_jupyterhub_user() -> str | None:
-    """Get the JupyterHub user name."""
-    return get_config_item(JUPYTERHUB_USER)
-
-
 def get_statistical_subject_source_url() -> str | None:
     """Get the URL to the statistical subject source."""
     return (

src/dapla_metadata/_shared/enums.py

@@ -5,7 +5,6 @@ class DaplaRegion(str, Enum):
     """Dapla platforms/regions."""
 
     DAPLA_LAB = "DAPLA_LAB"
-    BIP = "BIP"
     ON_PREM = "ON_PREM"
     CLOUD_RUN = "CLOUD_RUN"
 

src/dapla_metadata/dapla/user_info.py

@@ -8,7 +8,6 @@
 
 from dapla_metadata._shared import config
 from dapla_metadata._shared.enums import DaplaRegion
-from dapla_metadata._shared.enums import DaplaService
 
 logger = logging.getLogger(__name__)
 
@@ -110,36 +109,14 @@ def current_team(self) -> str:
         return parse_team_name(self.current_group)
 
 
-class JupyterHubUserInfo:
-    """Information about the current user when running on JupyterHub."""
-
-    @property
-    def short_email(self) -> str | None:
-        """Get the short email address."""
-        return config.get_jupyterhub_user()
-
-    @property
-    def current_group(self) -> str:
-        """Get the group which the user is currently representing."""
-        raise NotImplementedError
-
-    @property
-    def current_team(self) -> str:
-        """Get the team which the user is currently representing."""
-        raise NotImplementedError
-
-
 def get_user_info_for_current_platform() -> UserInfo:
     """Return the correct implementation of UserInfo for the current platform."""
     if config.get_dapla_region() == DaplaRegion.DAPLA_LAB:
         return DaplaLabUserInfo()
-    elif config.get_dapla_service() == DaplaService.JUPYTERLAB:  # noqa: RET505
-        return JupyterHubUserInfo()
-    else:
-        logger.warning(
-            "Was not possible to retrieve user information! Some fields may not be set.",
-        )
-        return UnknownUserInfo()
+    logger.warning(
+        "Was not possible to retrieve user information! Some fields may not be set.",
+    )
+    return UnknownUserInfo()
 
 
 def parse_team_name(group: str) -> str:

tests/dapla/test_user_info.py

@@ -2,23 +2,17 @@
 
 from dapla_metadata._shared.config import DAPLA_GROUP_CONTEXT
 from dapla_metadata._shared.config import DAPLA_REGION
-from dapla_metadata._shared.config import DAPLA_SERVICE
-from dapla_metadata._shared.config import JUPYTERHUB_USER
 from dapla_metadata._shared.config import OIDC_TOKEN
 from dapla_metadata._shared.enums import DaplaRegion
-from dapla_metadata._shared.enums import DaplaService
 from dapla_metadata.dapla import user_info
 from dapla_metadata.dapla.user_info import DaplaLabUserInfo
-from dapla_metadata.dapla.user_info import JupyterHubUserInfo
-from dapla_metadata.dapla.user_info import TestUserInfo
 from dapla_metadata.dapla.user_info import UnknownUserInfo
 from dapla_metadata.dapla.user_info import UserInfo
 
 
 @pytest.mark.parametrize(
     ("environment_variable_name", "environment_variable_value", "expected_class"),
     [
-        (DAPLA_SERVICE, DaplaService.JUPYTERLAB.value, JupyterHubUserInfo),
         (DAPLA_REGION, DaplaRegion.DAPLA_LAB.value, DaplaLabUserInfo),
         (None, None, UnknownUserInfo),
     ],
@@ -34,11 +28,6 @@ def test_get_user_info_for_current_platform(
     assert isinstance(user_info.get_user_info_for_current_platform(), expected_class)
 
 
-def test_jupyterhub_user_info_short_email(monkeypatch: pytest.MonkeyPatch):
-    monkeypatch.setenv(JUPYTERHUB_USER, TestUserInfo.PLACEHOLDER_EMAIL_ADDRESS)
-    assert JupyterHubUserInfo().short_email == TestUserInfo.PLACEHOLDER_EMAIL_ADDRESS
-
-
 def test_dapla_lab_user_info_short_email(
     fake_jwt: str,
     raw_jwt_payload: dict[str, object],