malevich-coretools 0.3.9__py3-none-any.whl → 0.3.11__py3-none-any.whl

malevich_coretools/abstract/abstract.py

@@ -111,7 +111,7 @@ class UserApp(BaseModel):
     image: JsonImage
     platform: str
     platformSettings: Optional[str] = None
-    extraCollectionsFrom: Optional[Dict[str, Alias.Id]] = None
+    extraCollectionsFrom: Optional[Dict[str, List[Alias.Id]]] = None
 
 
 class UserTask(BaseModel):
@@ -170,6 +170,7 @@ class UnscheduleOperation(BaseModel):
 class Restrictions(BaseModel):
     honestScale: bool = True
     singlePod: bool = False
+    smartAppsReuse: bool = False
 
 
 class MainTask(BaseModel):
@@ -217,7 +218,7 @@ class ResultIds(BaseModel):
 
 
 class FilesDirs(BaseModel):
-    files: List[str]
+    files: Dict[str, int]
     directories: List[str]
 
 
@@ -522,3 +523,51 @@ class BatchResponse(BaseModel):
 
 class BatchResponses(BaseModel):
     data: List[BatchResponse]
+
+
+class UserLimits(BaseModel):
+    # set by superuser
+    appMemoryRequest: int       # in Mi
+    appMemoryLimit: int         # in Mi
+    appCpuRequest: int          # in m
+    appCpuLimit: int            # in m
+    appStorageRequest: int      # in Mi
+    appStorageLimit: int        # in Mi
+    assetsLimit: int            # in Mi, if < 0 - unlimited
+    allowCommonGpu: int         # ignore if exist access key
+    gpuDiskMax: int             # ignore if exist access key
+
+    # set by user
+    defaultMemoryRequest: int   # in Mi
+    defaultMemoryLimit: int     # in Mi
+    defaultCpuRequest: int      # in m
+    defaultCpuLimit: int        # in m
+    defaultStorageRequest: int  # in Mi
+    defaultStorageLimit: int    # in Mi
+    defaultGpuDisk: int
+
+
+class BasePlatformSettings(BaseModel):
+    memoryRequest: Optional[int]
+    memoryLimit: Optional[int]
+    cpuRequest: Optional[int]
+    cpuLimit: Optional[int]
+    storageRequest: Optional[int]
+    storageLimit: Optional[int]
+
+
+class Limits(BasePlatformSettings):
+    gpuDisk: Optional[int]
+
+
+class LimitsScope(BaseModel):   # for superuser/admin
+    login: str
+    appMemoryRequest: Optional[int]
+    appMemoryLimit: Optional[int]
+    appCpuRequest: Optional[int]
+    appCpuLimit: Optional[int]
+    appStorageRequest: Optional[int]
+    appStorageLimit: Optional[int]
+    assetsLimit: Optional[int]
+    allowCommonGpu: Optional[bool]
+    gpuDiskMax: Optional[int]

malevich_coretools/funcs/funcs.py

@@ -643,6 +643,18 @@ def post_manager_app_pause(data: AppManage, wait: bool, *args, **kwargs) -> Alia
     return send_to_core_modify(MANAGER_APP_PAUSE(wait), data, *args, **kwargs)
 
 
+def get_limits(*args, **kwargs) -> UserLimits:
+    return model_from_json(send_to_core_get(LIMITS(True), *args, **kwargs), UserLimits)
+
+
+def post_limits(data: Limits, wait: bool, *args, **kwargs) -> Alias.Info:
+    return send_to_core_modify(LIMITS(wait), data, *args, **kwargs)
+
+
+def post_user_limits(data: LimitsScope, wait: bool, *args, **kwargs) -> Alias.Info:
+    return send_to_core_modify(LIMITS_USER(wait), data, *args, **kwargs)
+
+
 async def kafka_send(data: KafkaMsg, *args, **kwargs) -> Union[Alias.Info, KafkaMsg]:
     result = await send_to_core_post_async(KAFKA_SEND, data, *args, **kwargs)
     try:

malevich_coretools/funcs/helpers.py

@@ -8,6 +8,7 @@ from malevich_coretools.abstract.abstract import (
     DEFAULT_MSG_URL,
     Alias,
     AppSettings,
+    BasePlatformSettings,
     Cfg,
     DocsDataCollection,
     EndpointOverride,
@@ -163,10 +164,12 @@ def create_task_policy(
 def create_restrictions(
     honest_scale: bool = True,
     single_pod: bool = False,
+    smart_apps_reuse: bool = False,
 ) -> Restrictions:
     return Restrictions(
         honestScale=honest_scale,
         singlePod=single_pod,
+        smartAppsReuse=smart_apps_reuse,
     )
 
 
@@ -269,3 +272,21 @@ def create_cfg_struct(
         app_cfg_extension=app_cfg_extension_fixed,
         email=email,
     )
+
+
+def base_settings(
+    memory_request: Optional[int] = None,
+    memory_limit: Optional[int] = None,
+    cpu_request: Optional[int] = None,
+    cpu_limit: Optional[int] = None,
+    storage_request: Optional[int] = None,
+    storage_limit: Optional[int] = None,
+) -> str:
+    return BasePlatformSettings(
+        memoryRequest=memory_request,
+        memoryLimit=memory_limit,
+        cpuRequest=cpu_request,
+        cpuLimit=cpu_limit,
+        storageRequest=storage_request,
+        storageLimit=storage_limit,
+    ).model_dump_json()

malevich_coretools/secondary/const.py

@@ -33,9 +33,9 @@ def with_key_values(url: str, key_values: Dict[str, Optional[str]]) -> str:
     return url
 
 ## DocsController
-DOCS_MAIN = f"{API_VERSION}/docs/"
-DOCS = lambda wait: with_wait(DOCS_MAIN, wait)
-DOCS_ID = lambda id, wait: with_wait(f"{DOCS_MAIN}{id}", wait)
+DOCS_MAIN = f"{API_VERSION}/docs"
+DOCS = lambda wait: with_wait(f"{DOCS_MAIN}/", wait)
+DOCS_ID = lambda id, wait: with_wait(f"{DOCS_MAIN}/{id}", wait)
 
 ## CollectionsController
 COLLECTIONS_MAIN = f"{API_VERSION}/collections"
@@ -170,6 +170,11 @@ MANAGER_APP_STOP = lambda wait: with_wait(f"{MANAGER_MAIN}/app/stop", wait)
 MANAGER_APP_RESUME = lambda wait: with_wait(f"{MANAGER_MAIN}/app/resume", wait)
 MANAGER_APP_PAUSE = lambda wait: with_wait(f"{MANAGER_MAIN}/app/pause", wait)
 
+## LimitsController
+LIMITS_MAIN = f"{API_VERSION}/limits"
+LIMITS = lambda wait: with_wait(f"{LIMITS_MAIN}/", wait)
+LIMITS_USER = lambda wait: with_wait(f"{LIMITS_MAIN}/user", wait)
+
 ### Kafka
 KAFKA_SEND = f"{MANAGER_MAIN}/kafkaMsg"
 

malevich_coretools/tools/abstract.py

@@ -0,0 +1,51 @@
+from pydantic import BaseModel, Field
+
+
+class VastPlatformQuery(BaseModel):
+    bw_nvlink: float | None = Field(default=None, description="Bandwidth NVLink")
+    compute_cap: int | None = Field(default=None, description="CUDA compute capability * 100 (ie: 650 for 6.5, 700 for 7.0)")
+    cpu_cores: int | None = Field(default=None, description="Number of virtual CPU cores")
+    cpu_cores_effective: float | None = Field(default=None, description="Effective number of CPU cores")
+    cpu_ram: float | None = Field(default=None, description="System RAM in gigabytes")
+    cuda_vers: float | None = Field(default=None, description="Machine max supported CUDA version (based on driver version)")
+    datacenter: bool | None = Field(default=None, description="Show only datacenter offers")
+    direct_port_count: int | None = Field(default=None, description="Open ports on host's router")
+    disk_bw: float | None = Field(default=None, description="Disk read bandwidth, in MB/s")
+    disk_space: float | None = Field(default=None, description="Disk storage space, in GB")
+    dlperf: float | None = Field(default=None, description="DL-perf score")
+    dlperf_usd: float | None = Field(default=None, description="DL-perf/$")
+    dph: float | None = Field(default=None, description="$/hour rental cost")
+    driver_version: str | None = Field(default=None, description="Machine's NVIDIA driver version as 3 digit string ex. '535.86.05'")
+    duration: float | None = Field(default=None, description="Max rental duration in days")
+    external: bool | None = Field(default=False, description="Show external offers in addition to datacenter offers")
+    flops_usd: float | None = Field(default=None, description="TFLOPs/$")
+    geolocation: str | None = Field(default=None, description="Two letter country code. Works with operators =, !=, in, not in (e.g. geolocation not in [XV,XZ])")
+    gpu_mem_bw: float | None = Field(default=None, description="GPU memory bandwidth in GB/s")
+    gpu_name: str | None = Field(default=None, description="GPU model name (no quotes, replace spaces with underscores, ie: RTX_3090 rather than 'RTX 3090')")
+    gpu_ram: float | None = Field(default=None, description="GPU RAM in GB")
+    gpu_frac: float | None = Field(default=None, description="Ratio of GPUs in the offer to GPUs in the system")
+    gpu_display_active: bool | None = Field(default=None, description="True if the GPU has a display attached")
+    has_avx: bool | None = Field(default=None, description="CPU supports AVX instruction set")
+    id: int | None = Field(default=None, description="Instance unique ID")
+    inet_down: float | None = Field(default=None, description="Internet download speed in Mb/s")
+    inet_down_cost: float | None = Field(default=None, description="Internet download bandwidth cost in $/GB")
+    inet_up: float | None = Field(default=None, description="Internet upload speed in Mb/s")
+    inet_up_cost: float | None = Field(default=None, description="Internet upload bandwidth cost in $/GB")
+    machine_id: int | None = Field(default=None, description="Machine ID of instance")
+    min_bid: float | None = Field(default=None, description="Current minimum bid price in $/hr for interruptible")
+    num_gpus: int | None = Field(default=None, description="# of GPUs")
+    pci_gen: float | None = Field(default=None, description="PCIE generation")
+    pcie_bw: float | None = Field(default=None, description="PCIE bandwidth")
+    reliability: float | None = Field(default=None, description="Machine reliability score")
+    rentable: bool | None = Field(default=True, description="Is the instance currently rentable")
+    rented: bool | None = Field(default=False, description="Allow/disallow duplicates and potential conflicts with existing stopped instances")
+    storage_cost: float | None = Field(default=None, description="Storage cost in $/GB/month")
+    static_ip: bool | None = Field(default=None, description="Is the IP address static/stable")
+    total_flops: float | None = Field(default=None, description="Total TFLOPs from all GPUs")
+    verified: bool | None = Field(default=True, description="Is the machine verified")
+
+
+class VastPlatformSettings(BaseModel):
+    instance_id: int | None = None
+    advanced_query_settings: VastPlatformQuery | None = Field(default=None, description="Configure search settings to find GPU instances on-demand")
+    disk_size: int | None = Field(default=None, description="Disk storage space, in GB")

malevich_coretools/utils.py

@@ -15,6 +15,7 @@ from malevich_coretools.batch import (  # noqa: F401
     DefferOperation,
 )
 from malevich_coretools.funcs.helpers import (  # noqa: F401
+    base_settings,
     create_app_settings,
     create_cfg_struct,
     create_endpoint_override,
@@ -1562,7 +1563,7 @@ def create_app(
     image_auth: Optional[AUTH] = None,
     platform: str = "base",
     platform_settings: Optional[str] = None,
-    extra_collections_from: Optional[Dict[str, str]] = None,
+    extra_collections_from: Optional[Dict[str, Union[List[str], str]]] = None,
     wait: bool = True,
     *,
     use_system_auth: bool = True,
@@ -1585,6 +1586,10 @@ def create_app(
     if Config.WITH_WARNINGS and (image_user is None or image_token is None):
         Config.logger.warning("image_auth not set")
     json_image = JsonImage(ref=image_ref, user=image_user, token=image_token)
+    if extra_collections_from is not None:
+        for k, v in extra_collections_from.items():
+            if isinstance(v, str):
+                extra_collections_from[k] = [v]
     data = UserApp(
         appId=app_id,
         inputId=input_id,
@@ -1612,7 +1617,7 @@ def update_app(
     image_auth: Optional[AUTH] = None,
     platform: str = "base",
     platform_settings: Optional[str] = None,
-    extra_collections_from: Optional[Dict[str, str]] = None,
+    extra_collections_from: Optional[Dict[str, Union[List[str], str]]] = None,
     wait: bool = True,
     *,
     use_system_auth: bool = True,
@@ -1634,6 +1639,10 @@ def update_app(
     if Config.WITH_WARNINGS and (image_user is None or image_token is None):
         Config.logger.warning("image_auth not set")
     json_image = JsonImage(ref=image_ref, user=image_user, token=image_token)
+    if extra_collections_from is not None:
+        for k, v in extra_collections_from.items():
+            if isinstance(v, str):
+                extra_collections_from[k] = [v]
     data = UserApp(
         appId=app_id,
         inputId=input_id,
@@ -1932,7 +1941,7 @@ def __fix_cfg(cfg: Union[Dict[str, Any], Alias.Json, Cfg]) -> str:
         for app_setting in cfg.app_settings:
             if isinstance(app_setting.saveCollectionsName, str):
                 app_setting.saveCollectionsName = [app_setting.saveCollectionsName]
-        cfg_json = cfg.json()
+        cfg_json = cfg.model_dump_json()
     else:
         if isinstance(cfg, Alias.Json):
             cfg = json.loads(cfg)
@@ -2771,6 +2780,76 @@ def app_pause(
     )
 
 
+# Limits
+
+
+def get_user_limits(
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+) -> UserLimits:
+    """return limits for user"""
+    if batcher is None:
+        batcher = Config.BATCHER
+    if batcher is not None:
+        return batcher.add("getLimits", result_model=UserLimits)
+    return f.get_limits(auth=auth, conn_url=conn_url)
+
+
+def update_user_limits(
+    memory_request: Optional[int] = None,
+    memory_limit: Optional[int] = None,
+    cpu_request: Optional[int] = None,
+    cpu_limit: Optional[int] = None,
+    storage_request: Optional[int] = None,
+    storage_limit: Optional[int] = None,
+    gpu_disk: Optional[int] = None,
+    wait: bool = True,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+) -> Alias.Info:
+    """update limits for user"""
+    if batcher is None:
+        batcher = Config.BATCHER
+    data = Limits(memoryRequest=memory_request, memoryLimit=memory_limit, cpuRequest=cpu_request, cpuLimit=cpu_limit, storageRequest=storage_request, storageLimit=storage_limit, gpuDisk=gpu_disk)
+    if batcher is not None:
+        return batcher.add("postLimits", data=data)
+    return f.post_limits(
+        data, wait=wait, auth=auth, conn_url=conn_url
+    )
+
+
+def update_user_limits_scope(
+    login: str,
+    app_memory_request: Optional[int] = None,
+    app_memory_limit: Optional[int] = None,
+    app_cpu_request: Optional[int] = None,
+    app_cpu_limit: Optional[int] = None,
+    app_storage_request: Optional[int] = None,
+    app_storage_limit: Optional[int] = None,
+    assets_limit: Optional[int] = None,
+    allow_common_gpu: Optional[bool] = None,
+    gpu_disk_max: Optional[int] = None,
+    wait: bool = True,
+    *,
+    auth: Optional[AUTH] = None,
+    conn_url: Optional[str] = None,
+    batcher: Optional[Batcher] = None,
+) -> Alias.Info:
+    """update limits scope for user, for superuser/admin"""
+    if batcher is None:
+        batcher = Config.BATCHER
+    data = LimitsScope(login=login, appMemoryRequest=app_memory_request, appMemoryLimit=app_memory_limit, appCpuRequest=app_cpu_request, appCpuLimit=app_cpu_limit, appStorageRequest=app_storage_request, appStorageLimit=app_storage_limit, assetsLimit=assets_limit, allowCommonGpu=allow_common_gpu, gpuDiskMax=gpu_disk_max)
+    if batcher is not None:
+        return batcher.add("postUserLimits", data=data)
+    return f.post_user_limits(
+        data, wait=wait, auth=auth, conn_url=conn_url
+    )
+
+
 # kafka
 
 

{malevich_coretools-0.3.9.dist-info → malevich_coretools-0.3.11.dist-info}/METADATA

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

{malevich_coretools-0.3.9.dist-info → malevich_coretools-0.3.11.dist-info}/RECORD

@@ -1,7 +1,7 @@
 malevich_coretools/__init__.py,sha256=DJtPESxkCZD2SbTZTrR_x0TKDQ4MJpmBqGw5YpKYidM,134
-malevich_coretools/utils.py,sha256=YPNYwhGTZTGWSPLX1vOMTTugSoQsU4CEiW6-rDLKa2I,93382
+malevich_coretools/utils.py,sha256=H0edeBCNTwZsjSRI0jNcKptKxIqwUlLZgG9ebHDLq3o,96326
 malevich_coretools/abstract/__init__.py,sha256=ZWtP4gFLpNVFXzlMKXEK4iMnUqqMg07pL8yKGSJd6QI,38
-malevich_coretools/abstract/abstract.py,sha256=lMUDKf_GwExy8xLoOkotPSbVaPFT1LjYleJ3pNYw7xU,11762
+malevich_coretools/abstract/abstract.py,sha256=n-n_ZjrhtIb4dGqjYUP6GJq2496Ug0ef95h7OGDlFj4,13229
 malevich_coretools/abstract/statuses.py,sha256=9ISSw_evsylBshLXoU44TCoFOrZm4bXIxyAFFDqdUWc,333
 malevich_coretools/admin/__init__.py,sha256=zdIcHs3T_NZ8HYWts-O7OpBEWHIu779QDZMGF5HRCLg,35
 malevich_coretools/admin/utils.py,sha256=68fbVsZ-Rmi4YMiOirr6_i03ruT-ts7xSuUntb7JdHs,3015
@@ -9,17 +9,18 @@ malevich_coretools/batch/__init__.py,sha256=co0xKwCGgHMk-r4Q62U6vUFhRdYsUMIfnx9I
 malevich_coretools/batch/utils.py,sha256=cqX34sfh85dCwLv7qprxatzhYxxj7LqZwjhlmk_3GXQ,7705
 malevich_coretools/funcs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 malevich_coretools/funcs/checks.py,sha256=Q5pRtRevQrGv_-SMbn2GgYnulhclDLBXdRtbw2QOYKU,223
-malevich_coretools/funcs/funcs.py,sha256=NM8TqdcnZ1bQrDejxEf-4aeL56JuG7oZ-I_DF-K3L5o,33904
-malevich_coretools/funcs/helpers.py,sha256=4Rin3TMfbZ6t0LUs7iltmdccmNTRoNOJlVkrurSFIH4,9202
+malevich_coretools/funcs/funcs.py,sha256=AwlbVr8WBT4VSUk28w2CDr5eYbn6ktXuZQpYJQ85jVI,34344
+malevich_coretools/funcs/helpers.py,sha256=CZYza0uQ68ywcfeUE9rP7q0VjsfnLtBp4z0qQZbIkjY,9843
 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=TAbJxCQSFhe5zokGh8137mN33tGRFapFcldoynD94Jo,11435
+malevich_coretools/secondary/const.py,sha256=eO_LGpAfJVEmj7PJQq6lovC8WZ-XoO_ynGAnpMggV7M,11623
 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/abstract.py,sha256=B1RW1FeNHrQ6r1k-cQZ4k4noCRXkIGt-JUwVoXEDkAg,4466
 malevich_coretools/tools/vast.py,sha256=63tvy70qQV9vnK0eWytlgjBGSnfA7l3kSIDgACBbMMs,12893
-malevich_coretools-0.3.9.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-malevich_coretools-0.3.9.dist-info/METADATA,sha256=GBI_0sYncVRBFQLsNUJtWZ0CVoHyz5sC4jULbW6Wq6M,264
-malevich_coretools-0.3.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-malevich_coretools-0.3.9.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
-malevich_coretools-0.3.9.dist-info/RECORD,,
+malevich_coretools-0.3.11.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+malevich_coretools-0.3.11.dist-info/METADATA,sha256=rcSq6VtokUHEhlmGW9C46m9CWzvOv2tHH94cHbEnh2c,265
+malevich_coretools-0.3.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+malevich_coretools-0.3.11.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
+malevich_coretools-0.3.11.dist-info/RECORD,,