malevich-coretools 0.3.6__py3-none-any.whl → 0.3.8__py3-none-any.whl

malevich_coretools/secondary/const.py

@@ -1,3 +1,4 @@
+import urllib
 from typing import Dict, Optional
 
 import aiohttp
@@ -24,6 +25,8 @@ def with_key_values(url: str, key_values: Dict[str, Optional[str]]) -> str:
     sep = "?"
     for key, value in key_values.items():
         if value is not None:
+            if isinstance(value, str):
+                value = urllib.parse.quote(value, safe='')
             url = f"{url}{sep}{key}={value}"
             if sep == "?":
                 sep = "&"
@@ -37,21 +40,21 @@ DOCS_ID = lambda id, wait: with_wait(f"{DOCS_MAIN}{id}", wait)
 ## CollectionsController
 COLLECTIONS_MAIN = f"{API_VERSION}/collections"
 COLLECTIONS = lambda wait: with_wait(f"{COLLECTIONS_MAIN}/", wait)
-COLLECTIONS_IDS_NAME = lambda name, operation_id, run_id: with_key_values(f"{COLLECTIONS_MAIN}/ids/name/{name}", {"operationId": operation_id, "runId": run_id})
-COLLECTIONS_NAME = lambda name, operation_id, run_id, offset, limit: with_key_values(f"{COLLECTIONS_MAIN}/name/{name}", {"operationId": operation_id, "runId": run_id, "offset": offset, "limit": limit})
-COLLECTIONS_IDS_GROUP_NAME = lambda name, operation_id, run_id: with_key_values(f"{COLLECTIONS_MAIN}/ids/groupName/{name}", {"operationId": operation_id, "runId": run_id})
-COLLECTIONS_GROUP_NAME = lambda name, operation_id, run_id: with_key_values(f"{COLLECTIONS_MAIN}/groupName/{name}", {"operationId": operation_id, "runId": run_id})
-COLLECTIONS_ID = lambda id, offset, limit: with_key_values(f"{COLLECTIONS_MAIN}/{id}", {"offset": offset, "limit": limit})
-COLLECTIONS_ID_MODIFY = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/{id}", wait)
-COLLECTIONS_ID_S3 = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/s3/{id}", wait)
-COLLECTIONS_ID_ADD = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/{id}/add", wait)
-COLLECTIONS_ID_COPY = lambda id, full_copy, wait: with_key_values(f"{COLLECTIONS_MAIN}/{id}/copy", {"wait": None if wait is None else bool_to_str(wait), "fullCopy": None if full_copy is None else bool_to_str(full_copy)})
-COLLECTIONS_ID_DEL = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/{id}/del", wait)
+COLLECTIONS_IDS_NAME = lambda name, operation_id, run_id: with_key_values(f"{COLLECTIONS_MAIN}/ids/name/{urllib.parse.quote(name, safe='')}", {"operationId": operation_id, "runId": run_id})
+COLLECTIONS_NAME = lambda name, operation_id, run_id, offset, limit: with_key_values(f"{COLLECTIONS_MAIN}/name/{urllib.parse.quote(name, safe='')}", {"operationId": operation_id, "runId": run_id, "offset": offset, "limit": limit})
+COLLECTIONS_IDS_GROUP_NAME = lambda name, operation_id, run_id: with_key_values(f"{COLLECTIONS_MAIN}/ids/groupName/{urllib.parse.quote(name, safe='')}", {"operationId": operation_id, "runId": run_id})
+COLLECTIONS_GROUP_NAME = lambda name, operation_id, run_id: with_key_values(f"{COLLECTIONS_MAIN}/groupName/{urllib.parse.quote(name, safe='')}", {"operationId": operation_id, "runId": run_id})
+COLLECTIONS_ID = lambda id, offset, limit: with_key_values(f"{COLLECTIONS_MAIN}/{urllib.parse.quote(id, safe='')}", {"offset": offset, "limit": limit})
+COLLECTIONS_ID_MODIFY = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/{urllib.parse.quote(id, safe='')}", wait)
+COLLECTIONS_ID_S3 = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/s3/{urllib.parse.quote(id, safe='')}", wait)
+COLLECTIONS_ID_ADD = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/{urllib.parse.quote(id, safe='')}/add", wait)
+COLLECTIONS_ID_COPY = lambda id, full_copy, wait: with_key_values(f"{COLLECTIONS_MAIN}/{urllib.parse.quote(id, safe='')}/copy", {"wait": None if wait is None else bool_to_str(wait), "fullCopy": None if full_copy is None else bool_to_str(full_copy)})
+COLLECTIONS_ID_DEL = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/{urllib.parse.quote(id, safe='')}/del", wait)
 COLLECTIONS_DATA = lambda wait: with_wait(f"{COLLECTIONS_MAIN}/data", wait)
-COLLECTIONS_APPLY_SCHEME = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/{id}/applyScheme", wait)
-COLLECTIONS_FIX_SCHEME = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/{id}/fixScheme", wait)
-COLLECTIONS_UNFIX_SCHEME = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/{id}/unfixScheme", wait)
-COLLECTIONS_METADATA = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/{id}/metadata", wait)
+COLLECTIONS_APPLY_SCHEME = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/{urllib.parse.quote(id, safe='')}/applyScheme", wait)
+COLLECTIONS_FIX_SCHEME = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/{urllib.parse.quote(id, safe='')}/fixScheme", wait)
+COLLECTIONS_UNFIX_SCHEME = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/{urllib.parse.quote(id, safe='')}/unfixScheme", wait)
+COLLECTIONS_METADATA = lambda id, wait: with_wait(f"{COLLECTIONS_MAIN}/{urllib.parse.quote(id, safe='')}/metadata", wait)
 
 ## CollectionObjectsController
 COLLECTION_OBJECTS_MAIN = f"{API_VERSION}/collectionObjects"
@@ -64,43 +67,43 @@ COLLECTION_OBJECTS_PRESIGN = lambda signature, zip: with_key_values(f"{COLLECTIO
 
 ## EndpointController
 ENDPOINTS_MAIN = f"{API_VERSION}/endpoints"
-ENDPOINTS = lambda hash, wait: with_wait(f"{ENDPOINTS_MAIN}/{hash}", wait)
+ENDPOINTS = lambda hash, wait: with_wait(f"{ENDPOINTS_MAIN}/{urllib.parse.quote(hash, safe='')}", wait)
 ENDPOINTS_ALL = lambda wait: with_wait(f"{ENDPOINTS_MAIN}/all", wait)
-ENDPOINTS_RUN = lambda hash: f"{ENDPOINTS_MAIN}/run/{hash}"
+ENDPOINTS_RUN = lambda hash: f"{ENDPOINTS_MAIN}/run/{urllib.parse.quote(hash, safe='')}"
 ENDPOINTS_CREATE = lambda wait: with_wait(f"{ENDPOINTS_MAIN}/create", wait)
 ENDPOINTS_UPDATE = lambda wait: with_wait(f"{ENDPOINTS_MAIN}/update", wait)
-ENDPOINTS_PAUSE = lambda hash, wait: with_wait(f"{ENDPOINTS_MAIN}/pause/{hash}", wait)
-ENDPOINTS_RESUME = lambda hash, wait: with_wait(f"{ENDPOINTS_MAIN}/resume/{hash}", wait)
+ENDPOINTS_PAUSE = lambda hash, wait: with_wait(f"{ENDPOINTS_MAIN}/pause/{urllib.parse.quote(hash, safe='')}", wait)
+ENDPOINTS_RESUME = lambda hash, wait: with_wait(f"{ENDPOINTS_MAIN}/resume/{urllib.parse.quote(hash, safe='')}", wait)
 
 ## SchemeController
 SCHEMES_MAIN = f"{API_VERSION}/schemes"
 SCHEMES = lambda wait: with_wait(f"{SCHEMES_MAIN}/", wait)
-SCHEMES_ID = lambda id, wait: with_wait(f"{SCHEMES_MAIN}/{id}", wait)
-SCHEMES_ID_RAW = lambda id: f"{SCHEMES_MAIN}/{id}/raw"
+SCHEMES_ID = lambda id, wait: with_wait(f"{SCHEMES_MAIN}/{urllib.parse.quote(id, safe='')}", wait)
+SCHEMES_ID_RAW = lambda id: f"{SCHEMES_MAIN}/{urllib.parse.quote(id, safe='')}/raw"
 SCHEMES_MAPPING = lambda wait: with_wait(f"{SCHEMES_MAIN}/mapping", wait)
-SCHEMES_MAPPING_IDS = lambda from_id, to_id: f"{SCHEMES_MAIN}/mapping/{from_id}/{to_id}"
+SCHEMES_MAPPING_IDS = lambda from_id, to_id: f"{SCHEMES_MAIN}/mapping/{urllib.parse.quote(from_id, safe='')}/{urllib.parse.quote(to_id, safe='')}"
 
 ## CommonController
 CHECK = ""
 PING = "ping"
 # COMMON_MAIN = f"{API_VERSION}/common"
 # MAPPING = lambda wait: with_wait(f"{COMMON_MAIN}/mapping", wait)
-# MAPPING_ID = lambda id, wait: with_wait(f"{COMMON_MAIN}/mapping/{id}", wait)
+# MAPPING_ID = lambda id, wait: with_wait(f"{COMMON_MAIN}/mapping/{urllib.parse.quote(id, safe='')}", wait)
 # COMMON_ALL = lambda wait: with_wait(f"{COMMON_MAIN}/all", wait)
 
 ## UserShareController
 SHARE_MAIN = f"{API_VERSION}/share"
 SHARE = lambda wait: with_wait(f"{SHARE_MAIN}/", wait)
-SHARE_COLLECTION_ID = lambda id, wait: with_wait(f"{SHARE_MAIN}/collection/{id}", wait)
-SHARE_SCHEME_ID = lambda id, wait: with_wait(f"{SHARE_MAIN}/scheme/{id}", wait)
-SHARE_USER_APP_ID = lambda id, wait: with_wait(f"{SHARE_MAIN}/userApp/{id}", wait)
-SHARE_LOGIN = lambda login: f"{SHARE_MAIN}/login/{login}"
+SHARE_COLLECTION_ID = lambda id, wait: with_wait(f"{SHARE_MAIN}/collection/{urllib.parse.quote(id, safe='')}", wait)
+SHARE_SCHEME_ID = lambda id, wait: with_wait(f"{SHARE_MAIN}/scheme/{urllib.parse.quote(id, safe='')}", wait)
+SHARE_USER_APP_ID = lambda id, wait: with_wait(f"{SHARE_MAIN}/userApp/{urllib.parse.quote(id, safe='')}", wait)
+SHARE_LOGIN = lambda login: f"{SHARE_MAIN}/login/{urllib.parse.quote(login, safe='')}"
 SHARE_ALL = lambda wait: with_wait(f"{SHARE_MAIN}/all", wait)
 
 ## RegistrationController
 REGISTER_MAIN = f"{API_VERSION}/register"
 REGISTER = f"{REGISTER_MAIN}/"
-REGISTER_LOGIN = lambda login, wait: with_wait(f"{REGISTER_MAIN}/login/{login}", wait)
+REGISTER_LOGIN = lambda login, wait: with_wait(f"{REGISTER_MAIN}/login/{urllib.parse.quote(login, safe='')}", wait)
 REGISTER_ALL = f"{REGISTER_MAIN}/all"
 
 ## UserAppsController
@@ -108,36 +111,36 @@ USER_APPS_MAIN = f"{API_VERSION}/userApps"
 USER_APPS = lambda wait: with_wait(f"{USER_APPS_MAIN}/", wait)
 USER_APPS_REAL_IDS = f"{USER_APPS_MAIN}/realIds"
 USER_APPS_MAP_IDS = f"{USER_APPS_MAIN}/mapIds"
-USER_APPS_ID = lambda id, wait: with_wait(f"{USER_APPS_MAIN}/{id}", wait)
-USER_APPS_REAL_ID = lambda id: f"{USER_APPS_MAIN}/realIds/{id}"
+USER_APPS_ID = lambda id, wait: with_wait(f"{USER_APPS_MAIN}/{urllib.parse.quote(id, safe='')}", wait)
+USER_APPS_REAL_ID = lambda id: f"{USER_APPS_MAIN}/realIds/{urllib.parse.quote(id, safe='')}"
 
 ## UserTasksController
 USER_TASKS_MAIN = f"{API_VERSION}/userTasks"
 USER_TASKS = lambda wait: with_wait(f"{USER_TASKS_MAIN}/", wait)
 USER_TASKS_REAL_IDS = f"{USER_TASKS_MAIN}/realIds"
 USER_TASKS_MAP_IDS = f"{USER_TASKS_MAIN}/mapIds"
-USER_TASKS_ID = lambda id, wait: with_wait(f"{USER_TASKS_MAIN}/{id}", wait)
-USER_TASKS_REAL_ID = lambda id: f"{USER_TASKS_MAIN}/realIds/{id}"
+USER_TASKS_ID = lambda id, wait: with_wait(f"{USER_TASKS_MAIN}/{urllib.parse.quote(id, safe='')}", wait)
+USER_TASKS_REAL_ID = lambda id: f"{USER_TASKS_MAIN}/realIds/{urllib.parse.quote(id, safe='')}"
 
 ## UserCfgsController
 USER_CFGS_MAIN = f"{API_VERSION}/userCfgs"
 USER_CFGS = lambda wait: with_wait(f"{USER_CFGS_MAIN}/", wait)
 USER_CFGS_REAL_IDS = f"{USER_CFGS_MAIN}/realIds"
 USER_CFGS_MAP_IDS = f"{USER_CFGS_MAIN}/mapIds"
-USER_CFGS_ID = lambda id, wait: with_wait(f"{USER_CFGS_MAIN}/{id}", wait)
-USER_CFGS_REAL_ID = lambda id: f"{USER_CFGS_MAIN}/realIds/{id}"
+USER_CFGS_ID = lambda id, wait: with_wait(f"{USER_CFGS_MAIN}/{urllib.parse.quote(id, safe='')}", wait)
+USER_CFGS_REAL_ID = lambda id: f"{USER_CFGS_MAIN}/realIds/{urllib.parse.quote(id, safe='')}"
 
 ## OperationResultsController
 OPERATION_RESULTS_MAIN = f"{API_VERSION}/operationResults"
 OPERATION_RESULTS = lambda wait: with_wait(f"{OPERATION_RESULTS_MAIN}/", wait)
-OPERATION_RESULTS_ID = lambda id, wait: with_wait(f"{OPERATION_RESULTS_MAIN}/{id}", wait)
+OPERATION_RESULTS_ID = lambda id, wait: with_wait(f"{OPERATION_RESULTS_MAIN}/{urllib.parse.quote(id, safe='')}", wait)
 
 ## TempRunController
 TEMP_RUN_MAIN = f"{API_VERSION}/run"
-TEMP_RUN_CONDITION = lambda operationId: f"{TEMP_RUN_MAIN}/condition/{operationId}"
+TEMP_RUN_CONDITION = lambda operationId: f"{TEMP_RUN_MAIN}/condition/{urllib.parse.quote(operationId, safe='')}"
 TEMP_RUN_ACTIVE_RUNS = f"{TEMP_RUN_MAIN}/activeRuns"
-TEMP_RUN_MAIN_TASK_CFG = lambda operationId: f"{TEMP_RUN_MAIN}/mainTaskCfg/{operationId}"
-TEMP_RUN_OPERATIONS_IDS = lambda taskId, cfgId: f"{TEMP_RUN_MAIN}/operationsIds/{taskId}" if cfgId is None else f"{TEMP_RUN_MAIN}/operationsIds/{taskId}/{cfgId}"
+TEMP_RUN_MAIN_TASK_CFG = lambda operationId: f"{TEMP_RUN_MAIN}/mainTaskCfg/{urllib.parse.quote(operationId, safe='')}"
+TEMP_RUN_OPERATIONS_IDS = lambda taskId, cfgId: f"{TEMP_RUN_MAIN}/operationsIds/{urllib.parse.quote(taskId, safe='')}" if cfgId is None else f"{TEMP_RUN_MAIN}/operationsIds/{urllib.parse.quote(taskId, safe='')}/{urllib.parse.quote(cfgId, safe='')}"
 
 ## AdminController
 ADMIN_MAIN = f"{API_VERSION}/admin"
@@ -149,11 +152,11 @@ ADMIN_SUPERUSER = f"{ADMIN_MAIN}/superuser"
 MANAGER_MAIN = f"{API_VERSION}/manager"
 MANAGER_LOGS = f"{MANAGER_MAIN}/logs"
 MANAGER_CLICKHOUSE_ALL = f"{MANAGER_MAIN}/clickhouse"
-MANAGER_CLICKHOUSE_ID = lambda operationId: f"{MANAGER_MAIN}/clickhouse/{operationId}"
+MANAGER_CLICKHOUSE_ID = lambda operationId: f"{MANAGER_MAIN}/clickhouse/{urllib.parse.quote(operationId, safe='')}"
 MANAGER_DAG_KEY_VALUE = lambda wait: with_wait(f"{MANAGER_MAIN}/dagKeyValue", wait)
-MANAGER_DAG_KEY_VALUE_OPERATION_ID = lambda operationId: f"{MANAGER_MAIN}/dagKeyValue/{operationId}"
-MANAGER_APP_INFO = lambda appId: f"{MANAGER_MAIN}/appInfo/{appId}"
-MANAGER_APP_INFO_REAL_ID = lambda appId: f"{MANAGER_MAIN}/appInfo/realId/{appId}"
+MANAGER_DAG_KEY_VALUE_OPERATION_ID = lambda operationId: f"{MANAGER_MAIN}/dagKeyValue/{urllib.parse.quote(operationId, safe='')}"
+MANAGER_APP_INFO = lambda appId: f"{MANAGER_MAIN}/appInfo/{urllib.parse.quote(appId, safe='')}"
+MANAGER_APP_INFO_REAL_ID = lambda appId: f"{MANAGER_MAIN}/appInfo/realId/{urllib.parse.quote(appId, safe='')}"
 MANAGER_IMAGE_INFO = f"{MANAGER_MAIN}/imageInfo"
 MANAGER_TASK_SCHEDULES = f"{MANAGER_MAIN}/task/schedules"
 MANAGER_TASK = lambda wait: with_wait(f"{MANAGER_MAIN}/task", wait)

malevich_coretools/tools/vast.py

@@ -333,7 +333,7 @@ def parse(
 
 
 def vast_settings(
-    id: Optional[int] = None, query: Optional[Union[str, Dict[str, Any]]] = None, api_key: Optional[str] = None
+    id: Optional[int] = None, query: Optional[Union[str, Dict[str, Any]]] = None, api_key: Optional[str] = None, disk: Optional[int] = None
 ) -> str:
     """
     Platform settings for create app:\n
@@ -359,6 +359,9 @@ def vast_settings(
             assert isinstance(query, dict), "wrong query type: it should be str or dict"
             res["query"] = query
     if api_key is not None:
-        assert isinstance(id, str), "wrong api_key type"
+        assert isinstance(api_key, str), "wrong api_key type"
         res["apiKey"] = api_key
+    if disk is not None:
+        assert isinstance(disk, int), "wrong disk type"
+        res["disk"] = disk
     return json.dumps(res)

{malevich_coretools-0.3.6.dist-info → malevich_coretools-0.3.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: malevich-coretools
-Version: 0.3.6
+Version: 0.3.8
 Author: Andrew Pogrebnoj
 Author-email: andrew@onjulius.co
 License-File: LICENSE

{malevich_coretools-0.3.6.dist-info → malevich_coretools-0.3.8.dist-info}/RECORD

@@ -13,13 +13,13 @@ malevich_coretools/funcs/funcs.py,sha256=NM8TqdcnZ1bQrDejxEf-4aeL56JuG7oZ-I_DF-K
 malevich_coretools/funcs/helpers.py,sha256=4Rin3TMfbZ6t0LUs7iltmdccmNTRoNOJlVkrurSFIH4,9202
 malevich_coretools/secondary/__init__.py,sha256=048HqvG36_1WdDVZK_RuECmaf14Iq2fviUysG1inlaE,78
 malevich_coretools/secondary/config.py,sha256=hRlSJuPQnhKyt1wmOAJX_XmcliaO0fPGbW94AE_Mazs,463
-malevich_coretools/secondary/const.py,sha256=gQaPj_H2QHjc2BP_g6VGBgDF7pcAxGl33GYWE_A1sVQ,10047
+malevich_coretools/secondary/const.py,sha256=TAbJxCQSFhe5zokGh8137mN33tGRFapFcldoynD94Jo,11435
 malevich_coretools/secondary/helpers.py,sha256=t-W9g9t0O1EaAX8UOb1wxXFAMawbtDotDH47t0GdjG4,6142
 malevich_coretools/secondary/kafka_utils.py,sha256=SIUnBFyfwsquN6MAUrEkKCw-1l7979Znl7OTQSX2UKo,989
 malevich_coretools/tools/__init__.py,sha256=jDxlCa5Dr6Y43qlI7JwsRAlBkKmFeTHTEnjNUvu-0iw,46
-malevich_coretools/tools/vast.py,sha256=5DtpQwWOA-bolTeuLoqlPQdSMR8vjPkCpc-DvA924Wk,12652
-malevich_coretools-0.3.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-malevich_coretools-0.3.6.dist-info/METADATA,sha256=SzPUzmsYmegAFS4YERcR9vmMwlWe_uiQgIdKZtn7FoU,264
-malevich_coretools-0.3.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-malevich_coretools-0.3.6.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
-malevich_coretools-0.3.6.dist-info/RECORD,,
+malevich_coretools/tools/vast.py,sha256=dGiilVBx2Z3srq_Y9kku4lqCnjByQDBVFFs_58Waj8s,12793
+malevich_coretools-0.3.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+malevich_coretools-0.3.8.dist-info/METADATA,sha256=5AmeL_pOWcRr4OSOvFRTVVeXv6YE-mdgd9HFpVppqTc,264
+malevich_coretools-0.3.8.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+malevich_coretools-0.3.8.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
+malevich_coretools-0.3.8.dist-info/RECORD,,