Merge pull request #52 from Project-MONAI/mem_resource

Allow setting memory resource with string

Author: gigony

monai/deploy/core/application.py

@@ -20,6 +20,7 @@
 from monai.deploy.core.models import ModelFactory
 from monai.deploy.exceptions import IOMappingError
 from monai.deploy.utils.importutil import get_class_file_path, get_docstring, is_subclass
+from monai.deploy.utils.sizeutil import convert_bytes
 
 from .app_context import AppContext
 from .datastores import DatastoreFactory
@@ -303,7 +304,7 @@ def get_package_info(self, model_path: Union[str, Path] = "") -> Dict:
             "resource": {
                 "cpu": resource.cpu,
                 "gpu": resource.gpu,
-                "memory": resource.memory,
+                "memory": convert_bytes(resource.memory),
             },
             "models": model_list,
             "pip-packages": pip_requirement_list,

monai/deploy/core/operator.py

@@ -182,7 +182,7 @@ def decorator(cls):
         else:
             raise UnknownTypeError("Use @input decorator only for a subclass of Operator!")
 
-        def new_builder(self):
+        def new_builder(self: Operator):
             if builder:
                 builder(self)  # execute the original builder
             self.add_input(label, data_type, storage_type)
@@ -212,7 +212,7 @@ def decorator(cls):
         else:
             raise UnknownTypeError("Use @output decorator only for a subclass of Operator!")
 
-        def new_builder(self):
+        def new_builder(self: Operator):
             if builder:
                 builder(self)  # execute the original builder
             self.add_output(label, data_type, storage_type)

monai/deploy/core/resource.py

@@ -11,7 +11,8 @@
 
 from typing import Optional, Union
 
-from monai.deploy.exceptions import ItemAlreadyExistsError, UnknownTypeError, UnsupportedOperationError
+from monai.deploy.exceptions import ItemAlreadyExistsError, UnknownTypeError, WrongValueError
+from monai.deploy.utils.sizeutil import get_bytes
 
 
 class Resource:
@@ -75,8 +76,10 @@ def set_resource_limits(
                 )
 
         if type(memory_limit) == str:
-            # TODO(gigony): convert str to int
-            raise UnsupportedOperationError("Memory limit must be an integer.")
+            try:
+                self._memory = get_bytes(memory_limit)
+            except Exception as e:
+                raise WrongValueError(f"Memory size specified in the application (via @resource) is not valid: {e.args[0]}")
         else:
             if memory_limit is not None:
                 if self._memory is None:
@@ -116,7 +119,7 @@ def decorator(cls):
         else:
             raise UnknownTypeError("Use @resource decorator only for a subclass of Application!")
 
-        def new_builder(self):
+        def new_builder(self: Application):
             if builder:
                 builder(self)  # execute the original builder
 

monai/deploy/exceptions.py

@@ -39,6 +39,11 @@ class UnknownTypeError(MONAIAppSdkError):
 
     pass
 
+class WrongValueError(MONAIAppSdkError):
+    """Raises when wrong value is specified."""
+
+    pass
+
 class UnsupportedOperationError(MONAIAppSdkError):
     """Raises when unsupported operation is requested."""