Skip to content

Commit 7101ab5

Browse files
pcrespovpcrespov
committed
rename rpc namespace
1 parent 3fa9b0e commit 7101ab5

File tree

10 files changed

+63
-55
lines changed

10 files changed

+63
-55
lines changed

‎packages/models-library/src/models_library/api_schemas_webserver/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from ..rabbitmq_basic_types import RPCNamespace
66

7-
WEBSERVER_RPC_NAMESPACE: Final[RPCNamespace] = TypeAdapter(
7+
DEFAULT_WEBSERVER_RPC_NAMESPACE: Final[RPCNamespace] = TypeAdapter(
88
# NOTE: deprecated! Use app.state.settings.WEBSERVER_RPC_NAMESPACE
99
RPCNamespace
1010
).validate_python("webserver")

‎packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/auth/api_keys.py‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import logging
2+
import warnings
23

3-
from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
4+
from models_library.api_schemas_webserver import DEFAULT_WEBSERVER_RPC_NAMESPACE
45
from models_library.basic_types import IDStr
56
from models_library.rabbitmq_basic_types import RPCMethodName
67
from models_library.rpc.webserver.auth.api_keys import ApiKeyCreate, ApiKeyGet
@@ -12,6 +13,13 @@
1213

1314
_logger = logging.getLogger(__name__)
1415

16+
warnings.warn(
17+
f"The '{__name__}' module is deprecated and will be removed in a future release. "
18+
"Please use 'rpc_interfaces.webserver.v1' instead.",
19+
DeprecationWarning,
20+
stacklevel=2,
21+
)
22+
1523

1624
@log_decorator(_logger, level=logging.DEBUG)
1725
async def create_api_key(
@@ -22,7 +30,7 @@ async def create_api_key(
2230
api_key: ApiKeyCreate,
2331
) -> ApiKeyGet:
2432
result: ApiKeyGet = await rabbitmq_rpc_client.request(
25-
WEBSERVER_RPC_NAMESPACE,
33+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
2634
TypeAdapter(RPCMethodName).validate_python("create_api_key"),
2735
user_id=user_id,
2836
product_name=product_name,
@@ -42,7 +50,7 @@ async def get_api_key(
4250
api_key_id: IDStr,
4351
) -> ApiKeyGet:
4452
result: ApiKeyGet = await rabbitmq_rpc_client.request(
45-
WEBSERVER_RPC_NAMESPACE,
53+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
4654
TypeAdapter(RPCMethodName).validate_python("get_api_key"),
4755
user_id=user_id,
4856
product_name=product_name,
@@ -61,7 +69,7 @@ async def delete_api_key_by_key(
6169
api_key: str,
6270
) -> None:
6371
result = await rabbitmq_rpc_client.request(
64-
WEBSERVER_RPC_NAMESPACE,
72+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
6573
TypeAdapter(RPCMethodName).validate_python("delete_api_key_by_key"),
6674
user_id=user_id,
6775
product_name=product_name,

‎packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/functions/functions_rpc_interface.py‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import warnings
44
from typing import Literal
55

6-
from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
6+
from models_library.api_schemas_webserver import DEFAULT_WEBSERVER_RPC_NAMESPACE
77
from models_library.api_schemas_webserver.functions import (
88
Function,
99
FunctionID,
@@ -61,7 +61,7 @@ async def register_function(
6161
function: Function,
6262
) -> RegisteredFunction:
6363
result = await rabbitmq_rpc_client.request(
64-
WEBSERVER_RPC_NAMESPACE,
64+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
6565
TypeAdapter(RPCMethodName).validate_python("register_function"),
6666
function=function,
6767
user_id=user_id,
@@ -82,7 +82,7 @@ async def get_function(
8282
function_id: FunctionID,
8383
) -> RegisteredFunction:
8484
result = await rabbitmq_rpc_client.request(
85-
WEBSERVER_RPC_NAMESPACE,
85+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
8686
TypeAdapter(RPCMethodName).validate_python("get_function"),
8787
function_id=function_id,
8888
user_id=user_id,
@@ -101,7 +101,7 @@ async def get_function_input_schema(
101101
product_name: ProductName,
102102
) -> FunctionInputSchema:
103103
result = await rabbitmq_rpc_client.request(
104-
WEBSERVER_RPC_NAMESPACE,
104+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
105105
TypeAdapter(RPCMethodName).validate_python("get_function_input_schema"),
106106
function_id=function_id,
107107
user_id=user_id,
@@ -120,7 +120,7 @@ async def get_function_output_schema(
120120
product_name: ProductName,
121121
) -> FunctionOutputSchema:
122122
result = await rabbitmq_rpc_client.request(
123-
WEBSERVER_RPC_NAMESPACE,
123+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
124124
TypeAdapter(RPCMethodName).validate_python("get_function_output_schema"),
125125
function_id=function_id,
126126
user_id=user_id,
@@ -139,7 +139,7 @@ async def delete_function(
139139
product_name: ProductName,
140140
) -> None:
141141
result = await rabbitmq_rpc_client.request(
142-
WEBSERVER_RPC_NAMESPACE,
142+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
143143
TypeAdapter(RPCMethodName).validate_python("delete_function"),
144144
function_id=function_id,
145145
user_id=user_id,
@@ -165,7 +165,7 @@ async def list_functions(
165165
) -> tuple[list[RegisteredFunction], PageMetaInfoLimitOffset]:
166166
result: tuple[list[RegisteredFunction], PageMetaInfoLimitOffset] = (
167167
await rabbitmq_rpc_client.request(
168-
WEBSERVER_RPC_NAMESPACE,
168+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
169169
TypeAdapter(RPCMethodName).validate_python("list_functions"),
170170
pagination_offset=pagination_offset,
171171
pagination_limit=pagination_limit,
@@ -197,7 +197,7 @@ async def list_function_jobs(
197197
) -> tuple[list[RegisteredFunctionJob], PageMetaInfoLimitOffset]:
198198
result: tuple[list[RegisteredFunctionJob], PageMetaInfoLimitOffset] = (
199199
await rabbitmq_rpc_client.request(
200-
WEBSERVER_RPC_NAMESPACE,
200+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
201201
TypeAdapter(RPCMethodName).validate_python("list_function_jobs"),
202202
user_id=user_id,
203203
product_name=product_name,
@@ -230,7 +230,7 @@ async def list_function_jobs_with_status(
230230
PageMetaInfoLimitOffset,
231231
]:
232232
result = await rabbitmq_rpc_client.request(
233-
WEBSERVER_RPC_NAMESPACE,
233+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
234234
TypeAdapter(RPCMethodName).validate_python("list_function_jobs_with_status"),
235235
user_id=user_id,
236236
product_name=product_name,
@@ -260,7 +260,7 @@ async def list_function_job_collections(
260260
filters: FunctionJobCollectionsListFilters | None = None,
261261
) -> tuple[list[RegisteredFunctionJobCollection], PageMetaInfoLimitOffset]:
262262
result = await rabbitmq_rpc_client.request(
263-
WEBSERVER_RPC_NAMESPACE,
263+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
264264
TypeAdapter(RPCMethodName).validate_python("list_function_job_collections"),
265265
pagination_offset=pagination_offset,
266266
pagination_limit=pagination_limit,
@@ -284,7 +284,7 @@ async def update_function_title(
284284
title: str,
285285
) -> RegisteredFunction:
286286
result = await rabbitmq_rpc_client.request(
287-
WEBSERVER_RPC_NAMESPACE,
287+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
288288
TypeAdapter(RPCMethodName).validate_python("update_function_title"),
289289
function_id=function_id,
290290
title=title,
@@ -305,7 +305,7 @@ async def update_function_description(
305305
description: str,
306306
) -> RegisteredFunction:
307307
result = await rabbitmq_rpc_client.request(
308-
WEBSERVER_RPC_NAMESPACE,
308+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
309309
TypeAdapter(RPCMethodName).validate_python("update_function_description"),
310310
function_id=function_id,
311311
description=description,
@@ -326,7 +326,7 @@ async def run_function(
326326
product_name: ProductName,
327327
) -> RegisteredFunctionJob:
328328
result = await rabbitmq_rpc_client.request(
329-
WEBSERVER_RPC_NAMESPACE,
329+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
330330
TypeAdapter(RPCMethodName).validate_python("run_function"),
331331
function_id=function_id,
332332
inputs=inputs,
@@ -348,7 +348,7 @@ async def register_function_job(
348348
function_job: FunctionJob,
349349
) -> RegisteredFunctionJob:
350350
result = await rabbitmq_rpc_client.request(
351-
WEBSERVER_RPC_NAMESPACE,
351+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
352352
TypeAdapter(RPCMethodName).validate_python("register_function_job"),
353353
function_job=function_job,
354354
user_id=user_id,
@@ -370,7 +370,7 @@ async def patch_registered_function_job(
370370
registered_function_job_patch: RegisteredFunctionJobPatch,
371371
) -> RegisteredFunctionJob:
372372
result = await rabbitmq_rpc_client.request(
373-
WEBSERVER_RPC_NAMESPACE,
373+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
374374
TypeAdapter(RPCMethodName).validate_python("patch_registered_function_job"),
375375
user_id=user_id,
376376
product_name=product_name,
@@ -392,7 +392,7 @@ async def get_function_job(
392392
product_name: ProductName,
393393
) -> RegisteredFunctionJob:
394394
result = await rabbitmq_rpc_client.request(
395-
WEBSERVER_RPC_NAMESPACE,
395+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
396396
TypeAdapter(RPCMethodName).validate_python("get_function_job"),
397397
function_job_id=function_job_id,
398398
user_id=user_id,
@@ -412,7 +412,7 @@ async def get_function_job_status(
412412
product_name: ProductName,
413413
) -> FunctionJobStatus:
414414
result = await rabbitmq_rpc_client.request(
415-
WEBSERVER_RPC_NAMESPACE,
415+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
416416
TypeAdapter(RPCMethodName).validate_python("get_function_job_status"),
417417
function_job_id=function_job_id,
418418
user_id=user_id,
@@ -431,7 +431,7 @@ async def get_function_job_outputs(
431431
product_name: ProductName,
432432
) -> FunctionOutputs:
433433
result = await rabbitmq_rpc_client.request(
434-
WEBSERVER_RPC_NAMESPACE,
434+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
435435
TypeAdapter(RPCMethodName).validate_python("get_function_job_outputs"),
436436
function_job_id=function_job_id,
437437
user_id=user_id,
@@ -452,7 +452,7 @@ async def update_function_job_status(
452452
check_write_permissions: bool = True,
453453
) -> FunctionJobStatus:
454454
result = await rabbitmq_rpc_client.request(
455-
WEBSERVER_RPC_NAMESPACE,
455+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
456456
TypeAdapter(RPCMethodName).validate_python("update_function_job_status"),
457457
function_job_id=function_job_id,
458458
job_status=job_status,
@@ -475,7 +475,7 @@ async def update_function_job_outputs(
475475
check_write_permissions: bool = True,
476476
) -> FunctionOutputs:
477477
result = await rabbitmq_rpc_client.request(
478-
WEBSERVER_RPC_NAMESPACE,
478+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
479479
TypeAdapter(RPCMethodName).validate_python("update_function_job_outputs"),
480480
function_job_id=function_job_id,
481481
outputs=outputs,
@@ -496,7 +496,7 @@ async def delete_function_job(
496496
function_job_id: FunctionJobID,
497497
) -> None:
498498
result: None = await rabbitmq_rpc_client.request(
499-
WEBSERVER_RPC_NAMESPACE,
499+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
500500
TypeAdapter(RPCMethodName).validate_python("delete_function_job"),
501501
function_job_id=function_job_id,
502502
user_id=user_id,
@@ -516,7 +516,7 @@ async def find_cached_function_jobs(
516516
inputs: FunctionInputs,
517517
) -> list[RegisteredFunctionJob] | None:
518518
result = await rabbitmq_rpc_client.request(
519-
WEBSERVER_RPC_NAMESPACE,
519+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
520520
TypeAdapter(RPCMethodName).validate_python("find_cached_function_jobs"),
521521
function_id=function_id,
522522
inputs=inputs,
@@ -538,7 +538,7 @@ async def register_function_job_collection(
538538
function_job_collection: FunctionJobCollection,
539539
) -> RegisteredFunctionJobCollection:
540540
result = await rabbitmq_rpc_client.request(
541-
WEBSERVER_RPC_NAMESPACE,
541+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
542542
TypeAdapter(RPCMethodName).validate_python("register_function_job_collection"),
543543
function_job_collection=function_job_collection,
544544
user_id=user_id,
@@ -557,7 +557,7 @@ async def get_function_job_collection(
557557
product_name: ProductName,
558558
) -> RegisteredFunctionJobCollection:
559559
result = await rabbitmq_rpc_client.request(
560-
WEBSERVER_RPC_NAMESPACE,
560+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
561561
TypeAdapter(RPCMethodName).validate_python("get_function_job_collection"),
562562
function_job_collection_id=function_job_collection_id,
563563
user_id=user_id,
@@ -576,7 +576,7 @@ async def delete_function_job_collection(
576576
function_job_collection_id: FunctionJobCollectionID,
577577
) -> None:
578578
result = await rabbitmq_rpc_client.request(
579-
WEBSERVER_RPC_NAMESPACE,
579+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
580580
TypeAdapter(RPCMethodName).validate_python("delete_function_job_collection"),
581581
function_job_collection_id=function_job_collection_id,
582582
user_id=user_id,
@@ -595,7 +595,7 @@ async def get_function_user_permissions(
595595
function_id: FunctionID,
596596
) -> FunctionUserAccessRights:
597597
result = await rabbitmq_rpc_client.request(
598-
WEBSERVER_RPC_NAMESPACE,
598+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
599599
TypeAdapter(RPCMethodName).validate_python("get_function_user_permissions"),
600600
function_id=function_id,
601601
user_id=user_id,
@@ -613,7 +613,7 @@ async def get_functions_user_api_access_rights(
613613
product_name: ProductName,
614614
) -> FunctionUserApiAccessRights:
615615
result = await rabbitmq_rpc_client.request(
616-
WEBSERVER_RPC_NAMESPACE,
616+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
617617
TypeAdapter(RPCMethodName).validate_python(
618618
"get_functions_user_api_access_rights"
619619
),
@@ -642,7 +642,7 @@ async def set_group_permissions(
642642
]
643643
]:
644644
result = await rabbitmq_rpc_client.request(
645-
WEBSERVER_RPC_NAMESPACE,
645+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
646646
TypeAdapter(RPCMethodName).validate_python("set_group_permissions"),
647647
user_id=user_id,
648648
product_name=product_name,

‎packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/licenses/licensed_items.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import logging
22
import warnings
33

4-
from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
4+
from models_library.api_schemas_webserver import DEFAULT_WEBSERVER_RPC_NAMESPACE
55
from models_library.api_schemas_webserver.licensed_items import LicensedItemRpcGetPage
66
from models_library.api_schemas_webserver.licensed_items_checkouts import (
77
LicensedItemCheckoutRpcGet,
@@ -39,7 +39,7 @@ async def get_licensed_items(
3939
limit: int = 20,
4040
) -> LicensedItemRpcGetPage:
4141
result: LicensedItemRpcGetPage = await rabbitmq_rpc_client.request(
42-
WEBSERVER_RPC_NAMESPACE,
42+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
4343
TypeAdapter(RPCMethodName).validate_python("get_licensed_items"),
4444
product_name=product_name,
4545
offset=offset,
@@ -60,7 +60,7 @@ async def get_available_licensed_items_for_wallet(
6060
limit: int = 20,
6161
) -> LicensedItemRpcGetPage:
6262
result: LicensedItemRpcGetPage = await rabbitmq_rpc_client.request(
63-
WEBSERVER_RPC_NAMESPACE,
63+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
6464
TypeAdapter(RPCMethodName).validate_python(
6565
"get_available_licensed_items_for_wallet"
6666
),
@@ -86,7 +86,7 @@ async def checkout_licensed_item_for_wallet(
8686
service_run_id: ServiceRunID,
8787
) -> LicensedItemCheckoutRpcGet:
8888
result = await rabbitmq_rpc_client.request(
89-
WEBSERVER_RPC_NAMESPACE,
89+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
9090
TypeAdapter(RPCMethodName).validate_python("checkout_licensed_item_for_wallet"),
9191
licensed_item_id=licensed_item_id,
9292
product_name=product_name,
@@ -108,7 +108,7 @@ async def release_licensed_item_for_wallet(
108108
licensed_item_checkout_id: LicensedItemCheckoutID,
109109
) -> LicensedItemCheckoutRpcGet:
110110
result = await rabbitmq_rpc_client.request(
111-
WEBSERVER_RPC_NAMESPACE,
111+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
112112
TypeAdapter(RPCMethodName).validate_python("release_licensed_item_for_wallet"),
113113
product_name=product_name,
114114
user_id=user_id,

‎packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/projects.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import warnings
33
from typing import cast
44

5-
from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
5+
from models_library.api_schemas_webserver import DEFAULT_WEBSERVER_RPC_NAMESPACE
66
from models_library.products import ProductName
77
from models_library.projects import ProjectID
88
from models_library.rabbitmq_basic_types import RPCMethodName
@@ -46,7 +46,7 @@ async def mark_project_as_job(
4646
) -> None:
4747

4848
result = await rpc_client.request(
49-
WEBSERVER_RPC_NAMESPACE,
49+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
5050
TypeAdapter(RPCMethodName).validate_python("mark_project_as_job"),
5151
product_name=product_name,
5252
user_id=user_id,
@@ -70,7 +70,7 @@ async def list_projects_marked_as_jobs(
7070
filters: ListProjectsMarkedAsJobRpcFilters | None = None,
7171
) -> PageRpcProjectJobRpcGet:
7272
result = await rpc_client.request(
73-
WEBSERVER_RPC_NAMESPACE,
73+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
7474
TypeAdapter(RPCMethodName).validate_python("list_projects_marked_as_jobs"),
7575
product_name=product_name,
7676
user_id=user_id,
@@ -93,7 +93,7 @@ async def get_project_marked_as_job(
9393
job_parent_resource_name: str,
9494
) -> ProjectJobRpcGet:
9595
result = await rpc_client.request(
96-
WEBSERVER_RPC_NAMESPACE,
96+
DEFAULT_WEBSERVER_RPC_NAMESPACE,
9797
TypeAdapter(RPCMethodName).validate_python("get_project_marked_as_job"),
9898
product_name=product_name,
9999
user_id=user_id,

0 commit comments

Comments
 (0)