fix: git connectors and reading logs (#518)

Author: olevski

components/renku_data_services/message_queue/db.py

@@ -67,7 +67,8 @@ async def send_pending_events(self) -> None:
                     except Exception as e:
                         logger.warning(f"couldn't send event {event.payload} on queue {event.queue}: {e}")
 
-        logger.info(f"sent {n_total_events} events")
+        if n_total_events > 0:
+            logger.info(f"sent {n_total_events} events to the message queue")
 
     async def store_event(self, session: AsyncSession | Session, event: Event) -> int:
         """Store an event."""

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

@@ -83,6 +83,9 @@ async def get_pod_logs(self, name: str, max_log_lines: Optional[int] = None) ->
             try:
                 # NOTE: calling pod.logs without a container name set crashes the library
                 clogs: list[str] = [clog async for clog in pod.logs(container=container, tail_lines=max_log_lines)]
+            except httpx.ResponseNotRead:
+                # NOTE: This occurs when the container is still starting but we try to read its logs
+                continue
             except NotFoundError:
                 raise errors.MissingResourceError(message=f"The session pod {name} does not exist.")
             except ServerError as err:

components/renku_data_services/notebooks/blueprints.py

@@ -330,7 +330,15 @@ async def _handler(
                 if csr.target_path is not None and not PurePosixPath(csr.target_path).is_absolute():
                     csr.target_path = (work_dir / csr.target_path).as_posix()
                 dcs[csr_id] = dcs[csr_id].with_override(csr)
-            repositories = [Repository(url=i) for i in project.repositories]
+            git_providers = await self.nb_config.git_provider_helper.get_providers(user=user)
+            repositories: list[Repository] = []
+            for repo in project.repositories:
+                found_provider_id: str | None = None
+                for provider in git_providers:
+                    if urlparse(provider.url).netloc == urlparse(repo).netloc:
+                        found_provider_id = provider.id
+                        break
+                repositories.append(Repository(url=repo, provider=found_provider_id))
             secrets_to_create: list[V1Secret] = []
             # Generate the cloud starge secrets
             data_sources: list[DataSource] = []
@@ -359,7 +367,6 @@ async def _handler(
                         ),
                     )
                 )
-            git_providers = await self.nb_config.git_provider_helper.get_providers(user=user)
             git_clone = await init_containers.git_clone_container_v2(
                 user=user,
                 config=self.nb_config,

test/bases/renku_data_services/data_api/test_notebooks.py

@@ -80,7 +80,7 @@ async def jupyter_server(renku_image: str, server_name: str, pod_name: str) -> A
     await pod.wait("condition=Ready")
     yield server
     # NOTE: This is used also in tests that check if the server was properly stopped
-    # in this case the server will already gone when we try to delete it in the cleanup here.
+    # in this case the server will already be gone when we try to delete it in the cleanup here.
     with suppress(NotFoundError):
         await server.delete("Foreground")
 
@@ -109,7 +109,10 @@ async def practice_jupyter_server(renku_image: str, server_name: str) -> AsyncIt
 
     await server.create()
     yield server
-    await server.delete("Foreground")
+    # NOTE: This is used also in tests that check if the server was properly stopped
+    # in this case the server will already be gone when we try to delete it in the cleanup here.
+    with suppress(NotFoundError):
+        await server.delete("Foreground")
 
 
 @pytest.fixture()