Skip to content

Commit a32a9e2

Browse files
author
Andrei Neagu
committed
removed unused
1 parent 7f4770d commit a32a9e2

File tree

3 files changed

+1
-49
lines changed

3 files changed

+1
-49
lines changed

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/director_v0/_public_client.py

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
)
99
from models_library.projects import ProjectID
1010
from models_library.projects_nodes_io import NodeID
11-
from models_library.service_settings_labels import SimcoreServiceLabels
12-
from models_library.services_base import ServiceKeyVersion
1311
from models_library.users import UserID
1412
from pydantic import TypeAdapter
1513
from servicelib.fastapi.app_state import SingletonInAppStateMixin
@@ -49,17 +47,7 @@ async def get_running_service_details(
4947
_unenvelope_or_raise_error(response)
5048
)
5149

52-
async def get_service_labels( # required
53-
self, service: ServiceKeyVersion
54-
) -> SimcoreServiceLabels:
55-
response = await DirectorV0ThinClient.get_from_app_state(
56-
self.app
57-
).get_services_labels(service)
58-
return TypeAdapter(SimcoreServiceLabels).validate_python(
59-
_unenvelope_or_raise_error(response)
60-
)
61-
62-
async def get_running_services( # required
50+
async def get_running_services(
6351
self, user_id: UserID | None = None, project_id: ProjectID | None = None
6452
) -> list[RunningDynamicServiceDetails]:
6553
response = await DirectorV0ThinClient.get_from_app_state(

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/director_v0/_thin_client.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
import urllib.parse
2-
31
from common_library.unset import as_dict_exclude_none
42
from fastapi import FastAPI, status
53
from httpx import Response
64
from models_library.projects import ProjectID
75
from models_library.projects_nodes_io import NodeID
8-
from models_library.services_base import ServiceKeyVersion
96
from models_library.users import UserID
107
from servicelib.fastapi.app_state import SingletonInAppStateMixin
118
from servicelib.fastapi.http_client import AttachLifespanMixin
@@ -49,13 +46,6 @@ async def get_running_interactive_service_details(
4946
) -> Response:
5047
return await self.client.get(f"/running_interactive_services/{node_id}")
5148

52-
@retry_on_errors()
53-
@expect_status(status.HTTP_200_OK)
54-
async def get_services_labels(self, service: ServiceKeyVersion) -> Response:
55-
return await self.client.get(
56-
f"/services/{urllib.parse.quote_plus(service.key)}/{service.version}/labels"
57-
)
58-
5949
@retry_on_errors()
6050
@expect_status(status.HTTP_200_OK)
6151
async def get_running_interactive_services(

services/dynamic-scheduler/tests/unit/test_services_director_v0.py

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
from models_library.projects import ProjectID
1414
from models_library.projects_nodes_io import NodeID
1515
from models_library.service_settings_labels import SimcoreServiceLabels
16-
from models_library.services_base import ServiceKeyVersion
1716
from pydantic import TypeAdapter
1817
from pytest_simcore.helpers.typing_env import EnvVarsDict
1918
from simcore_service_dynamic_scheduler.services.director_v0 import (
@@ -43,13 +42,6 @@ def legacy_service_details(
4342
)
4443

4544

46-
@pytest.fixture
47-
def service_labels() -> SimcoreServiceLabels:
48-
return TypeAdapter(SimcoreServiceLabels).validate_python(
49-
SimcoreServiceLabels.model_json_schema()["examples"][0]
50-
)
51-
52-
5345
@pytest.fixture
5446
def mock_director_v0(
5547
node_id: NodeID,
@@ -78,14 +70,6 @@ def mock_director_v0(
7870
json={"data": [legacy_service_details.model_dump(mode="json")]},
7971
)
8072

81-
respx_mock.request(
82-
method="GET",
83-
path="/v0/services/simcore/services/dynamic/test/1.0.0/labels",
84-
).respond(
85-
status_code=200,
86-
json={"data": service_labels.model_dump(mode="jsone"), "error": None},
87-
)
88-
8973
yield
9074

9175

@@ -100,16 +84,6 @@ async def test_get_running_service_details(
10084
assert result == legacy_service_details
10185

10286

103-
async def test_get_service_labels(
104-
mock_director_v0: None, app: FastAPI, service_labels: SimcoreServiceLabels
105-
):
106-
client = DirectorV0PublicClient.get_from_app_state(app)
107-
labels = await client.get_service_labels(
108-
ServiceKeyVersion(key="simcore/services/dynamic/test", version="1.0.0")
109-
)
110-
assert labels.model_dump(mode="json") == service_labels.model_dump(mode="json")
111-
112-
11387
async def test_get_running_services(
11488
mock_director_v0: None,
11589
app: FastAPI,

0 commit comments

Comments
 (0)