@pcrespov generator -> iterator

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/core/_prometheus_instrumentation.py

@@ -1,5 +1,5 @@
 import logging
-from collections.abc import Generator
+from collections.abc import Iterator
 from dataclasses import dataclass, field
 from datetime import timedelta
 from typing import Final, cast
@@ -49,18 +49,18 @@ def __post_init__(self) -> None:
 
     def update_metrics(
         self,
-        log_queue_sizes: Generator[tuple[JobID, int]],
+        iter_log_queue_sizes: Iterator[tuple[JobID, int]],
         health_check_failure_count: PositiveInt,
     ):
         self._health_check_qauge.set(health_check_failure_count)
         self._logstreaming_queues.clear()
-        for job_id, length in log_queue_sizes:
+        for job_id, length in iter_log_queue_sizes:
             self._logstreaming_queues.labels(job_id=job_id).set(length)
 
 
 async def _collect_prometheus_metrics_task(app: FastAPI):
     get_instrumentation(app).update_metrics(
-        log_queue_sizes=get_log_distributor(app).log_queue_sizes,
+        iter_log_queue_sizes=get_log_distributor(app).iter_log_queue_sizes,
         health_check_failure_count=get_health_checker(app).health_check_failure_count,
     )
 

services/api-server/src/simcore_service_api_server/services_http/log_streaming.py

@@ -1,7 +1,7 @@
 import asyncio
 import logging
 from asyncio import Queue
-from collections.abc import AsyncIterable, Generator
+from collections.abc import AsyncIterable, Iterator
 from typing import Final
 
 from common_library.error_codes import create_error_code
@@ -86,7 +86,7 @@ async def deregister(self, job_id: JobID):
         del self._log_streamers[job_id]
 
     @property
-    def log_queue_sizes(self) -> Generator[tuple[JobID, int]]:
+    def iter_log_queue_sizes(self) -> Iterator[tuple[JobID, int]]:
         for k, v in self._log_streamers.items():
             yield k, v.qsize()