malevich-coretools 0.3.10__py3-none-any.whl → 0.3.12__py3-none-any.whl

malevich_coretools/abstract/abstract.py

@@ -40,7 +40,7 @@ class StopOperationMany(BaseModel):
 
 class DocWithName(BaseModel):
     data: Alias.Json
-    name: Optional[str]
+    name: Optional[str] = None
 
 
 class DocsCollection(BaseModel):
@@ -82,9 +82,9 @@ class SchemesIds(BaseModel):
 
 class Shared(BaseModel):
     userLogins: List[Alias.Login]
-    collectionsIds: Optional[List[Alias.Id]]
-    schemesIds: Optional[List[Alias.Id]]
-    userAppsIds: Optional[List[Alias.Id]]
+    collectionsIds: Optional[List[Alias.Id]] = None
+    schemesIds: Optional[List[Alias.Id]] = None
+    userAppsIds: Optional[List[Alias.Id]] = None
 
 
 class SharedWithUsers(BaseModel):
@@ -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):
@@ -132,7 +132,7 @@ class KeysValues(Operation):
 
 
 class ScaleInfo(BaseModel):
-    taskId: Optional[Alias.Id]
+    taskId: Optional[Alias.Id] = None
     appId: Alias.Id
     scale: int
 
@@ -175,7 +175,7 @@ class Restrictions(BaseModel):
 
 class MainTask(BaseModel):
     taskId: Alias.Id
-    cfgId: Optional[Alias.Id]
+    cfgId: Optional[Alias.Id] = None
     infoUrl: Optional[str] = None
     debugMode: bool = False
     run: bool = True
@@ -207,7 +207,7 @@ class RunTask(Operation):
 
 
 class AppManage(Operation):
-    taskId: Optional[Alias.Id]
+    taskId: Optional[Alias.Id] = None
     appId: Alias.Id
     runId: Alias.Id
 
@@ -322,12 +322,12 @@ class MainTaskCfg(BaseModel):
     tasks: Dict[Alias.Id, UserTask]
     cfg: str
     schemesNames: List[str]
-    infoUrl: Optional[str]
+    infoUrl: Optional[str] = None
     debugMode: bool
-    login: Optional[Alias.Login]
+    login: Optional[Alias.Login] = None
     coreManage: bool
     kafkaMode: bool
-    tlWithoutData: Optional[int]
+    tlWithoutData: Optional[int] = None
 
 
 class KafkaMsg(BaseModel):
@@ -386,14 +386,14 @@ class FunctionInfo(BaseModel):
     id: Alias.Id
     name: str
     arguments: List[Tuple[str, Optional[str]]]
-    finishMsg: Optional[str]
-    doc: Optional[str]
+    finishMsg: Optional[str] = None
+    doc: Optional[str] = None
 
 
 class InputFunctionInfo(FunctionInfo):
-    collectionsNames: Optional[List[str]]
-    extraCollectionsNames: Optional[List[str]]
-    query: Optional[str]
+    collectionsNames: Optional[List[str]] = None
+    extraCollectionsNames: Optional[List[str]] = None
+    query: Optional[str] = None
     mode: str
 
 
@@ -402,16 +402,16 @@ class ProcessorFunctionInfo(FunctionInfo):
 
 
 class OutputFunctionInfo(FunctionInfo):
-    collectionOutNames: Optional[List[str]]
+    collectionOutNames: Optional[List[str]] = None
 
 
 class InitInfo(BaseModel):
     id: Alias.Id
     enable: bool
-    tl: Optional[int]
+    tl: Optional[int] = None
     prepare: bool
-    argname: Optional[str]
-    doc: Optional[str]
+    argname: Optional[str] = None
+    doc: Optional[str] = None
 
 
 class AppFunctionsInfo(BaseModel):
@@ -484,7 +484,7 @@ class Endpoint(BaseModel):
 
 class EndpointRunInfo(BaseModel):
     active: bool
-    description: Optional[str]
+    description: Optional[str] = None
     author: str
     collections: Optional[Dict[str, str]] = None
 
@@ -548,26 +548,26 @@ class UserLimits(BaseModel):
 
 
 class BasePlatformSettings(BaseModel):
-    memoryRequest: Optional[int]
-    memoryLimit: Optional[int]
-    cpuRequest: Optional[int]
-    cpuLimit: Optional[int]
-    storageRequest: Optional[int]
-    storageLimit: Optional[int]
+    memoryRequest: Optional[int] = None
+    memoryLimit: Optional[int] = None
+    cpuRequest: Optional[int] = None
+    cpuLimit: Optional[int] = None
+    storageRequest: Optional[int] = None
+    storageLimit: Optional[int] = None
 
 
 class Limits(BasePlatformSettings):
-    gpuDisk: Optional[int]
+    gpuDisk: Optional[int] = None
 
 
 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]
+    appMemoryRequest: Optional[int] = None
+    appMemoryLimit: Optional[int] = None
+    appCpuRequest: Optional[int] = None
+    appCpuLimit: Optional[int] = None
+    appStorageRequest: Optional[int] = None
+    appStorageLimit: Optional[int] = None
+    assetsLimit: Optional[int] = None
+    allowCommonGpu: Optional[bool] = None
+    gpuDiskMax: Optional[int] = None

malevich_coretools/utils.py

@@ -1563,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,
@@ -1586,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,
@@ -1613,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,
@@ -1635,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,

{malevich_coretools-0.3.10.dist-info → malevich_coretools-0.3.12.dist-info}/METADATA

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

{malevich_coretools-0.3.10.dist-info → malevich_coretools-0.3.12.dist-info}/RECORD

@@ -1,7 +1,7 @@
 malevich_coretools/__init__.py,sha256=DJtPESxkCZD2SbTZTrR_x0TKDQ4MJpmBqGw5YpKYidM,134
-malevich_coretools/utils.py,sha256=3BeZXyVRTg6bHn690-8QuXsx_9WMisOrZnFU0xbZu88,95934
+malevich_coretools/utils.py,sha256=H0edeBCNTwZsjSRI0jNcKptKxIqwUlLZgG9ebHDLq3o,96326
 malevich_coretools/abstract/__init__.py,sha256=ZWtP4gFLpNVFXzlMKXEK4iMnUqqMg07pL8yKGSJd6QI,38
-malevich_coretools/abstract/abstract.py,sha256=WtXtXWaxZPLEmipdJPLQn1XZy-DeIJfb1sAQINWg7EY,13223
+malevich_coretools/abstract/abstract.py,sha256=E32Kxn7yz9lhf4k_6RMdeyngxhW0qFjeTgOecWwzw8U,13481
 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
@@ -19,8 +19,8 @@ malevich_coretools/secondary/kafka_utils.py,sha256=SIUnBFyfwsquN6MAUrEkKCw-1l797
 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.10.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-malevich_coretools-0.3.10.dist-info/METADATA,sha256=Tz_fKi_CtwojivrgHBw4D22ar_zK0oewz-8wXE58zlY,265
-malevich_coretools-0.3.10.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-malevich_coretools-0.3.10.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
-malevich_coretools-0.3.10.dist-info/RECORD,,
+malevich_coretools-0.3.12.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+malevich_coretools-0.3.12.dist-info/METADATA,sha256=rYE4QjZhLZpDnrsGwG6eWnGmwPXzrEB6f1tHxE3-zI0,265
+malevich_coretools-0.3.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+malevich_coretools-0.3.12.dist-info/top_level.txt,sha256=wDX3s1Tso0otBPNrFRfXqyNpm48W4Bp5v6JfbITO2Z8,19
+malevich_coretools-0.3.12.dist-info/RECORD,,