removed InternalClusterAuthentication

Author: sanderegg

packages/pytest-simcore/src/pytest_simcore/simcore_dask_service.py

@@ -9,7 +9,7 @@
 import distributed
 import pytest
 from distributed import Client
-from models_library.clusters import InternalClusterAuthentication, TLSAuthentication
+from models_library.clusters import ClusterAuthentication, TLSAuthentication
 from pydantic import AnyUrl
 
 from .helpers.docker import get_service_published_port
@@ -72,7 +72,7 @@ def dask_backend_tls_certificates(
 @pytest.fixture
 def dask_scheduler_auth(
     dask_backend_tls_certificates: _TLSCertificates,
-) -> InternalClusterAuthentication:
+) -> ClusterAuthentication:
     return TLSAuthentication(
         tls_ca_file=dask_backend_tls_certificates.tls_ca_file,
         tls_client_cert=dask_backend_tls_certificates.tls_cert_file,

services/autoscaling/src/simcore_service_autoscaling/core/settings.py

@@ -11,7 +11,7 @@
     PortInt,
     VersionTag,
 )
-from models_library.clusters import InternalClusterAuthentication
+from models_library.clusters import ClusterAuthentication
 from models_library.docker import DockerLabelKey
 from pydantic import (
     AliasChoices,
@@ -193,9 +193,9 @@ class NodesMonitoringSettings(BaseCustomSettings):
 
 class DaskMonitoringSettings(BaseCustomSettings):
     DASK_MONITORING_URL: AnyUrl = Field(
-        ..., description="the url to the osparc-dask-scheduler"
+        ..., description="the url to the dask-scheduler"
     )
-    DASK_SCHEDULER_AUTH: InternalClusterAuthentication = Field(
+    DASK_SCHEDULER_AUTH: ClusterAuthentication = Field(
         ...,
         description="defines the authentication of the clusters created via clusters-keeper (can be None or TLS)",
     )

services/autoscaling/src/simcore_service_autoscaling/modules/auto_scaling_mode_computational.py

@@ -4,7 +4,7 @@
 
 from aws_library.ec2 import EC2InstanceData, EC2Tags, Resources
 from fastapi import FastAPI
-from models_library.clusters import InternalClusterAuthentication
+from models_library.clusters import ClusterAuthentication
 from models_library.docker import (
     DOCKER_TASK_EC2_INSTANCE_TYPE_PLACEMENT_CONSTRAINT_KEY,
     DockerLabelKey,
@@ -37,7 +37,7 @@ def _scheduler_url(app: FastAPI) -> AnyUrl:
     return app_settings.AUTOSCALING_DASK.DASK_MONITORING_URL
 
 
-def _scheduler_auth(app: FastAPI) -> InternalClusterAuthentication:
+def _scheduler_auth(app: FastAPI) -> ClusterAuthentication:
     app_settings = get_application_settings(app)
     assert app_settings.AUTOSCALING_DASK  # nosec
     return app_settings.AUTOSCALING_DASK.DASK_SCHEDULER_AUTH

services/autoscaling/src/simcore_service_autoscaling/modules/dask.py

@@ -12,7 +12,7 @@
 from aws_library.ec2 import EC2InstanceData, Resources
 from dask_task_models_library.resource_constraints import DaskTaskResources
 from distributed.core import Status
-from models_library.clusters import InternalClusterAuthentication, TLSAuthentication
+from models_library.clusters import ClusterAuthentication, TLSAuthentication
 from pydantic import AnyUrl, ByteSize, TypeAdapter
 
 from ..core.errors import (
@@ -43,7 +43,7 @@ async def _wrap_client_async_routine(
 
 @contextlib.asynccontextmanager
 async def _scheduler_client(
-    url: AnyUrl, authentication: InternalClusterAuthentication
+    url: AnyUrl, authentication: ClusterAuthentication
 ) -> AsyncIterator[distributed.Client]:
     """
     Raises:
@@ -116,7 +116,7 @@ def _find_by_worker_host(
 
 async def is_worker_connected(
     scheduler_url: AnyUrl,
-    authentication: InternalClusterAuthentication,
+    authentication: ClusterAuthentication,
     worker_ec2_instance: EC2InstanceData,
 ) -> bool:
     with contextlib.suppress(DaskNoWorkersError, DaskWorkerNotFoundError):
@@ -130,7 +130,7 @@ async def is_worker_connected(
 
 async def is_worker_retired(
     scheduler_url: AnyUrl,
-    authentication: InternalClusterAuthentication,
+    authentication: ClusterAuthentication,
     worker_ec2_instance: EC2InstanceData,
 ) -> bool:
     with contextlib.suppress(DaskNoWorkersError, DaskWorkerNotFoundError):
@@ -156,7 +156,7 @@ def _dask_key_to_dask_task_id(key: dask.typing.Key) -> DaskTaskId:
 
 async def list_unrunnable_tasks(
     scheduler_url: AnyUrl,
-    authentication: InternalClusterAuthentication,
+    authentication: ClusterAuthentication,
 ) -> list[DaskTask]:
     """
     Raises:
@@ -188,7 +188,7 @@ def _list_tasks(
 
 async def list_processing_tasks_per_worker(
     scheduler_url: AnyUrl,
-    authentication: InternalClusterAuthentication,
+    authentication: ClusterAuthentication,
 ) -> dict[DaskWorkerUrl, list[DaskTask]]:
     """
     Raises:
@@ -227,7 +227,7 @@ def _list_processing_tasks(
 
 async def get_worker_still_has_results_in_memory(
     scheduler_url: AnyUrl,
-    authentication: InternalClusterAuthentication,
+    authentication: ClusterAuthentication,
     ec2_instance: EC2InstanceData,
 ) -> int:
     """
@@ -246,7 +246,7 @@ async def get_worker_still_has_results_in_memory(
 
 async def get_worker_used_resources(
     scheduler_url: AnyUrl,
-    authentication: InternalClusterAuthentication,
+    authentication: ClusterAuthentication,
     ec2_instance: EC2InstanceData,
 ) -> Resources:
     """
@@ -299,7 +299,7 @@ def _list_processing_tasks_on_worker(
 
 async def compute_cluster_total_resources(
     scheduler_url: AnyUrl,
-    authentication: InternalClusterAuthentication,
+    authentication: ClusterAuthentication,
     instances: list[AssociatedInstance],
 ) -> Resources:
     if not instances:
@@ -320,7 +320,7 @@ async def compute_cluster_total_resources(
 
 
 async def try_retire_nodes(
-    scheduler_url: AnyUrl, authentication: InternalClusterAuthentication
+    scheduler_url: AnyUrl, authentication: ClusterAuthentication
 ) -> None:
     async with _scheduler_client(scheduler_url, authentication) as client:
         await _wrap_client_async_routine(

services/autoscaling/tests/unit/test_modules_dask.py

@@ -13,7 +13,7 @@
 from aws_library.ec2 import Resources
 from faker import Faker
 from models_library.clusters import (
-    InternalClusterAuthentication,
+    ClusterAuthentication,
     NoAuthentication,
     TLSAuthentication,
 )
@@ -52,7 +52,7 @@
     "authentication", _authentication_types, ids=lambda p: f"authentication-{p.type}"
 )
 async def test__scheduler_client_with_wrong_url(
-    faker: Faker, authentication: InternalClusterAuthentication
+    faker: Faker, authentication: ClusterAuthentication
 ):
     with pytest.raises(DaskSchedulerNotFoundError):
         async with _scheduler_client(
@@ -72,7 +72,7 @@ def scheduler_url(dask_spec_local_cluster: distributed.SpecCluster) -> AnyUrl:
 
 
 @pytest.fixture
-def scheduler_authentication() -> InternalClusterAuthentication:
+def scheduler_authentication() -> ClusterAuthentication:
     return NoAuthentication()
 
 
@@ -92,7 +92,7 @@ def dask_workers_config() -> dict[str, Any]:
 
 
 async def test__scheduler_client(
-    scheduler_url: AnyUrl, scheduler_authentication: InternalClusterAuthentication
+    scheduler_url: AnyUrl, scheduler_authentication: ClusterAuthentication
 ):
     async with _scheduler_client(scheduler_url, scheduler_authentication):
         ...
@@ -109,7 +109,7 @@ async def test_list_unrunnable_tasks_with_no_workers(
 
 async def test_list_unrunnable_tasks(
     scheduler_url: AnyUrl,
-    scheduler_authentication: InternalClusterAuthentication,
+    scheduler_authentication: ClusterAuthentication,
     create_dask_task: Callable[[DaskTaskResources], distributed.Future],
 ):
     # we have nothing running now
@@ -131,7 +131,7 @@ async def test_list_unrunnable_tasks(
 
 async def test_list_processing_tasks(
     scheduler_url: AnyUrl,
-    scheduler_authentication: InternalClusterAuthentication,
+    scheduler_authentication: ClusterAuthentication,
     dask_spec_cluster_client: distributed.Client,
 ):
     def _add_fct(x: int, y: int) -> int:
@@ -190,7 +190,7 @@ def fake_ec2_instance_data_with_invalid_ec2_name(
 
 async def test_get_worker_still_has_results_in_memory_with_invalid_ec2_name_raises(
     scheduler_url: AnyUrl,
-    scheduler_authentication: InternalClusterAuthentication,
+    scheduler_authentication: ClusterAuthentication,
     fake_ec2_instance_data_with_invalid_ec2_name: EC2InstanceData,
 ):
     with pytest.raises(Ec2InvalidDnsNameError):
@@ -216,7 +216,7 @@ async def test_get_worker_still_has_results_in_memory_with_no_workers_raises(
 
 async def test_get_worker_still_has_results_in_memory_with_invalid_worker_host_raises(
     scheduler_url: AnyUrl,
-    scheduler_authentication: InternalClusterAuthentication,
+    scheduler_authentication: ClusterAuthentication,
     fake_ec2_instance_data: Callable[..., EC2InstanceData],
 ):
     ec2_instance_data = fake_ec2_instance_data()
@@ -229,7 +229,7 @@ async def test_get_worker_still_has_results_in_memory_with_invalid_worker_host_r
 @pytest.mark.parametrize("fct_shall_err", [True, False], ids=str)
 async def test_get_worker_still_has_results_in_memory(
     scheduler_url: AnyUrl,
-    scheduler_authentication: InternalClusterAuthentication,
+    scheduler_authentication: ClusterAuthentication,
     dask_spec_cluster_client: distributed.Client,
     fake_localhost_ec2_instance_data: EC2InstanceData,
     fct_shall_err: bool,
@@ -291,7 +291,7 @@ def _add_fct(x: int, y: int) -> int:
 
 async def test_worker_used_resources_with_invalid_ec2_name_raises(
     scheduler_url: AnyUrl,
-    scheduler_authentication: InternalClusterAuthentication,
+    scheduler_authentication: ClusterAuthentication,
     fake_ec2_instance_data_with_invalid_ec2_name: EC2InstanceData,
 ):
     with pytest.raises(Ec2InvalidDnsNameError):
@@ -317,7 +317,7 @@ async def test_worker_used_resources_with_no_workers_raises(
 
 async def test_worker_used_resources_with_invalid_worker_host_raises(
     scheduler_url: AnyUrl,
-    scheduler_authentication: InternalClusterAuthentication,
+    scheduler_authentication: ClusterAuthentication,
     fake_ec2_instance_data: Callable[..., EC2InstanceData],
 ):
     ec2_instance_data = fake_ec2_instance_data()
@@ -329,7 +329,7 @@ async def test_worker_used_resources_with_invalid_worker_host_raises(
 
 async def test_worker_used_resources(
     scheduler_url: AnyUrl,
-    scheduler_authentication: InternalClusterAuthentication,
+    scheduler_authentication: ClusterAuthentication,
     dask_spec_cluster_client: distributed.Client,
     fake_localhost_ec2_instance_data: EC2InstanceData,
 ):

services/director-v2/tests/integration/02/test_dynamic_sidecar_nodeports_integration.py

@@ -29,7 +29,7 @@
     assert_computation_task_out_obj,
 )
 from models_library.api_schemas_directorv2.comp_tasks import ComputationGet
-from models_library.clusters import DEFAULT_CLUSTER_ID, InternalClusterAuthentication
+from models_library.clusters import DEFAULT_CLUSTER_ID, ClusterAuthentication
 from models_library.projects import (
     Node,
     NodesDict,
@@ -360,7 +360,7 @@ def mock_env(
     network_name: str,
     dev_feature_r_clone_enabled: str,
     dask_scheduler_service: str,
-    dask_scheduler_auth: InternalClusterAuthentication,
+    dask_scheduler_auth: ClusterAuthentication,
     minimal_configuration: None,
     patch_storage_setup: None,
 ) -> None: