Skip to content

Commit 24d8a46

Browse files
pcrespovpcrespov
committed
rename
1 parent e2a9689 commit 24d8a46

File tree

5 files changed

+38
-38
lines changed

5 files changed

+38
-38
lines changed

‎services/catalog/src/simcore_service_catalog/db/repositories/services.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
from sqlalchemy.sql.expression import tuple_
2323

2424
from ...models.services_db import (
25-
ReleaseFromDB,
25+
ReleaseDBGet,
2626
ServiceAccessRightsAtDB,
2727
ServiceMetaDataDBCreate,
2828
ServiceMetaDataDBGet,
2929
ServiceMetaDataDBPatch,
30-
ServiceWithHistoryFromDB,
30+
ServiceWithHistoryDBGet,
3131
)
3232
from ...models.services_specifications import ServiceSpecificationsAtDB
3333
from ..tables import services_access_rights, services_meta_data, services_specifications
@@ -320,7 +320,7 @@ async def get_service_with_history(
320320
# get args
321321
key: ServiceKey,
322322
version: ServiceVersion,
323-
) -> ServiceWithHistoryFromDB | None:
323+
) -> ServiceWithHistoryDBGet | None:
324324

325325
stmt_get = get_service_stmt(
326326
product_name=product_name,
@@ -345,7 +345,7 @@ async def get_service_with_history(
345345
result = await conn.execute(stmt_history)
346346
row_h = result.one_or_none()
347347

348-
return ServiceWithHistoryFromDB(
348+
return ServiceWithHistoryDBGet(
349349
key=row.key,
350350
version=row.version,
351351
# display
@@ -378,7 +378,7 @@ async def list_latest_services(
378378
# list args: pagination
379379
limit: int | None = None,
380380
offset: int | None = None,
381-
) -> tuple[PositiveInt, list[ServiceWithHistoryFromDB]]:
381+
) -> tuple[PositiveInt, list[ServiceWithHistoryDBGet]]:
382382

383383
# get page
384384
stmt_total = total_count_stmt(
@@ -404,7 +404,7 @@ async def list_latest_services(
404404

405405
# compose history with latest
406406
items_page = [
407-
ServiceWithHistoryFromDB(
407+
ServiceWithHistoryDBGet(
408408
key=r.key,
409409
version=r.version,
410410
# display
@@ -438,7 +438,7 @@ async def get_service_history(
438438
user_id: UserID,
439439
# get args
440440
key: ServiceKey,
441-
) -> list[ReleaseFromDB] | None:
441+
) -> list[ReleaseDBGet] | None:
442442

443443
stmt_history = get_service_history_stmt(
444444
product_name=product_name,
@@ -451,7 +451,7 @@ async def get_service_history(
451451
row = result.one_or_none()
452452

453453
return (
454-
TypeAdapter(list[ReleaseFromDB]).validate_python(row.history)
454+
TypeAdapter(list[ReleaseDBGet]).validate_python(row.history)
455455
if row
456456
else None
457457
)

‎services/catalog/src/simcore_service_catalog/models/services_db.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
4343
schema.update(
4444
{
4545
"example": {
46-
"key": "simcore/services/dynamic/sim4life",
46+
"key": "simcore/services/dynamic/reading",
4747
"version": "1.0.9",
4848
"owner": 8,
4949
"name": "sim4life",
@@ -112,7 +112,7 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
112112
"examples": [
113113
# minimal w/ required values
114114
{
115-
"key": "simcore/services/dynamic/sim4life",
115+
"key": "simcore/services/dynamic/creating",
116116
"version": "1.0.9",
117117
"name": "sim4life",
118118
"description": "s4l web",
@@ -160,15 +160,15 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
160160
model_config = ConfigDict(json_schema_extra=_update_json_schema_extra)
161161

162162

163-
class ReleaseFromDB(BaseModel):
163+
class ReleaseDBGet(BaseModel):
164164
version: ServiceVersion
165165
version_display: str | None
166166
deprecated: datetime | None
167167
created: datetime
168168
compatibility_policy: CompatiblePolicyDict | None
169169

170170

171-
class ServiceWithHistoryFromDB(BaseModel):
171+
class ServiceWithHistoryDBGet(BaseModel):
172172
key: ServiceKey
173173
version: ServiceVersion
174174
# display
@@ -188,13 +188,13 @@ class ServiceWithHistoryFromDB(BaseModel):
188188
modified: datetime
189189
deprecated: datetime | None
190190
# releases
191-
history: list[ReleaseFromDB]
191+
history: list[ReleaseDBGet]
192192

193193

194194
assert ( # nosec
195-
set(ReleaseFromDB.model_fields)
195+
set(ReleaseDBGet.model_fields)
196196
.difference({"compatibility_policy"})
197-
.issubset(set(ServiceWithHistoryFromDB.model_fields))
197+
.issubset(set(ServiceWithHistoryDBGet.model_fields))
198198
)
199199

200200

‎services/catalog/src/simcore_service_catalog/services/compatibility.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from simcore_service_catalog.utils.versioning import as_version
1212

1313
from ..db.repositories.services import ServicesRepository
14-
from ..models.services_db import ReleaseFromDB
14+
from ..models.services_db import ReleaseDBGet
1515

1616

1717
def _get_default_compatibility_specs(target: ServiceVersion | Version) -> SpecifierSet:
@@ -41,7 +41,7 @@ def _get_latest_compatible_version(
4141
return max(compatible_versions, default=None)
4242

4343

44-
def _convert_to_versions(service_history: list[ReleaseFromDB]) -> list[Version]:
44+
def _convert_to_versions(service_history: list[ReleaseDBGet]) -> list[Version]:
4545
return sorted(
4646
(as_version(h.version) for h in service_history if not h.deprecated),
4747
reverse=True, # latest first
@@ -94,7 +94,7 @@ async def evaluate_service_compatibility_map(
9494
repo: ServicesRepository,
9595
product_name: ProductName,
9696
user_id: UserID,
97-
service_release_history: list[ReleaseFromDB],
97+
service_release_history: list[ReleaseDBGet],
9898
) -> dict[ServiceVersion, Compatibility | None]:
9999
released_versions = _convert_to_versions(service_release_history)
100100
result: dict[ServiceVersion, Compatibility | None] = {}

‎services/catalog/src/simcore_service_catalog/services/services_api.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from ..models.services_db import (
1919
ServiceAccessRightsAtDB,
2020
ServiceMetaDataDBPatch,
21-
ServiceWithHistoryFromDB,
21+
ServiceWithHistoryDBGet,
2222
)
2323
from ..services import manifest
2424
from ..services.director import DirectorApi
@@ -29,7 +29,7 @@
2929

3030

3131
def _db_to_api_model(
32-
service_db: ServiceWithHistoryFromDB,
32+
service_db: ServiceWithHistoryDBGet,
3333
access_rights_db: list[ServiceAccessRightsAtDB],
3434
service_manifest: ServiceMetaDataPublished,
3535
compatibility_map: dict[ServiceVersion, Compatibility | None] | None = None,

‎services/catalog/tests/unit/test_services_compatibility.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from packaging.version import Version
1313
from pytest_mock import MockerFixture, MockType
1414
from simcore_service_catalog.db.repositories.services import ServicesRepository
15-
from simcore_service_catalog.models.services_db import ReleaseFromDB
15+
from simcore_service_catalog.models.services_db import ReleaseDBGet
1616
from simcore_service_catalog.services.compatibility import (
1717
_get_latest_compatible_version,
1818
evaluate_service_compatibility_map,
@@ -178,10 +178,10 @@ async def test_evaluate_service_compatibility_map_with_default_policy(
178178
mock_repo: MockType, user_id: UserID
179179
):
180180
service_release_history = [
181-
_create_as(ReleaseFromDB, version="1.0.0"),
182-
_create_as(ReleaseFromDB, version="1.0.1"),
183-
_create_as(ReleaseFromDB, version="1.1.0"),
184-
_create_as(ReleaseFromDB, version="2.0.0"),
181+
_create_as(ReleaseDBGet, version="1.0.0"),
182+
_create_as(ReleaseDBGet, version="1.0.1"),
183+
_create_as(ReleaseDBGet, version="1.1.0"),
184+
_create_as(ReleaseDBGet, version="2.0.0"),
185185
]
186186

187187
compatibility_map = await evaluate_service_compatibility_map(
@@ -199,14 +199,14 @@ async def test_evaluate_service_compatibility_map_with_custom_policy(
199199
mock_repo: MockType, user_id: UserID
200200
):
201201
service_release_history = [
202-
_create_as(ReleaseFromDB, version="1.0.0"),
202+
_create_as(ReleaseDBGet, version="1.0.0"),
203203
_create_as(
204-
ReleaseFromDB,
204+
ReleaseDBGet,
205205
version="1.0.1",
206206
compatibility_policy={"versions_specifier": ">1.1.0,<=2.0.0"},
207207
),
208-
_create_as(ReleaseFromDB, version="1.2.0"),
209-
_create_as(ReleaseFromDB, version="2.0.0"),
208+
_create_as(ReleaseDBGet, version="1.2.0"),
209+
_create_as(ReleaseDBGet, version="2.0.0"),
210210
]
211211

212212
compatibility_map = await evaluate_service_compatibility_map(
@@ -228,9 +228,9 @@ async def test_evaluate_service_compatibility_map_with_other_service(
228228
mock_repo: MockType, user_id: UserID
229229
):
230230
service_release_history = [
231-
_create_as(ReleaseFromDB, version="1.0.0"),
231+
_create_as(ReleaseDBGet, version="1.0.0"),
232232
_create_as(
233-
ReleaseFromDB,
233+
ReleaseDBGet,
234234
version="1.0.1",
235235
compatibility_policy={
236236
"other_service_key": "simcore/services/comp/other_service",
@@ -240,9 +240,9 @@ async def test_evaluate_service_compatibility_map_with_other_service(
240240
]
241241

242242
mock_repo.get_service_history.return_value = [
243-
_create_as(ReleaseFromDB, version="5.0.0"),
244-
_create_as(ReleaseFromDB, version="5.1.0"),
245-
_create_as(ReleaseFromDB, version="5.2.0"),
243+
_create_as(ReleaseDBGet, version="5.0.0"),
244+
_create_as(ReleaseDBGet, version="5.1.0"),
245+
_create_as(ReleaseDBGet, version="5.2.0"),
246246
]
247247

248248
compatibility_map = await evaluate_service_compatibility_map(
@@ -265,10 +265,10 @@ async def test_evaluate_service_compatibility_map_with_deprecated_versions(
265265
mock_repo: MockType, user_id: UserID
266266
):
267267
service_release_history = [
268-
_create_as(ReleaseFromDB, version="1.0.0"),
269-
_create_as(ReleaseFromDB, version="1.0.1", deprecated=arrow.now().datetime),
270-
_create_as(ReleaseFromDB, version="1.2.0"),
271-
_create_as(ReleaseFromDB, version="1.2.5"),
268+
_create_as(ReleaseDBGet, version="1.0.0"),
269+
_create_as(ReleaseDBGet, version="1.0.1", deprecated=arrow.now().datetime),
270+
_create_as(ReleaseDBGet, version="1.2.0"),
271+
_create_as(ReleaseDBGet, version="1.2.5"),
272272
]
273273

274274
compatibility_map = await evaluate_service_compatibility_map(

0 commit comments

Comments
 (0)