feat: use the amalthea session cache

Author: olevski

components/renku_data_services/notebooks/api/classes/k8s_client.py

@@ -351,10 +351,13 @@ def __init__(self, url: str, server_type: type[_SessionType]):
         self.url = url
         self.client = httpx.AsyncClient()
         self.server_type: type[_SessionType] = server_type
+        self.url_path_name = "servers"
+        if server_type == AmaltheaSessionV1Alpha1:
+            self.url_path_name = "sessions"
 
     async def list_servers(self, safe_username: str) -> list[_SessionType]:
         """List the jupyter servers."""
-        url = urljoin(self.url, f"/users/{safe_username}/servers")
+        url = urljoin(self.url, f"/users/{safe_username}/{self.url_path_name}")
         try:
             res = await self.client.get(url, timeout=10)
         except httpx.RequestError as err:
@@ -372,7 +375,7 @@ async def list_servers(self, safe_username: str) -> list[_SessionType]:
 
     async def get_server(self, name: str) -> _SessionType | None:
         """Get a specific jupyter server."""
-        url = urljoin(self.url, f"/servers/{name}")
+        url = urljoin(self.url, f"/{self.url_path_name}/{name}")
         try:
             res = await self.client.get(url, timeout=10)
         except httpx.RequestError as err:

components/renku_data_services/notebooks/blueprints.py

@@ -918,8 +918,8 @@ async def _handler(
                         args=environment.args,
                         shmSize="1G",
                         env=[
-                            SessionEnvItem(name="RENKU_BASE_URL_PATH", value=base_server_url),
-                            SessionEnvItem(name="RENKU_BASE_URL", value=base_server_path),
+                            SessionEnvItem(name="RENKU_BASE_URL_PATH", value=base_server_path),
+                            SessionEnvItem(name="RENKU_BASE_URL", value=base_server_url),
                         ],
                     ),
                     ingress=Ingress(