feat: new container specs, allow decimal CPUs units (#337)

* feat: prices for new container specs

* fix: remove wrong price tier

* fix: allow decimals cpu usage

* fix: use 512m instead of 0.5g in resources specs

* chore: inc ver

Author: aledefra

extensions/business/container_apps/container_app_runner.py

@@ -2065,7 +2065,7 @@ def start_container(self):
 
     self.P(log_str)
 
-    nano_cpu_limit = self._cpu_limit * 1_000_000_000
+    nano_cpu_limit = int(self._cpu_limit * 1_000_000_000)
     mem_reservation = f"{parse_memory_to_mb(self._mem_limit, 0.9)}m"
 
     run_kwargs = dict(

extensions/business/container_apps/container_utils.py

@@ -307,7 +307,7 @@ def _setup_resource_limits_and_ports(self):
 
     container_resources = self.cfg_container_resources
     if isinstance(container_resources, dict) and len(container_resources) > 0:
-      self._cpu_limit = int(container_resources.get("cpu", DEFAULT_CPU_LIMIT))
+      self._cpu_limit = float(container_resources.get("cpu", DEFAULT_CPU_LIMIT))
       self._gpu_limit = container_resources.get("gpu", DEFAULT_GPU_LIMIT)
       self._mem_limit = container_resources.get("memory", DEFAULT_MEM_LIMIT)
 
@@ -417,7 +417,7 @@ def _setup_resource_limits_and_ports(self):
       # endif main_port_mapped
     else:
       # No container resources specified, use defaults
-      self._cpu_limit = DEFAULT_CPU_LIMIT
+      self._cpu_limit = float(DEFAULT_CPU_LIMIT)
       self._gpu_limit = DEFAULT_GPU_LIMIT
       self._mem_limit = DEFAULT_MEM_LIMIT
 

extensions/business/deeploy/deeploy_const.py

@@ -144,6 +144,8 @@ class DEFAULT_CONTAINER_RESOURCES:
 
 JOB_TYPE_RESOURCE_SPECS = {
   # Generic Apps
+  53: {DEEPLOY_RESOURCES.CPU: 0.25, DEEPLOY_RESOURCES.MEMORY: '512m', DEEPLOY_RESOURCES.STORAGE: '2g'}, # micro
+  54: {DEEPLOY_RESOURCES.CPU: 0.5, DEEPLOY_RESOURCES.MEMORY: '1g', DEEPLOY_RESOURCES.STORAGE: '4g'}, # lite
   1: {DEEPLOY_RESOURCES.CPU: 1, DEEPLOY_RESOURCES.MEMORY: '2g', DEEPLOY_RESOURCES.STORAGE: '8g'}, # entry
   2: {DEEPLOY_RESOURCES.CPU: 2, DEEPLOY_RESOURCES.MEMORY: '4g', DEEPLOY_RESOURCES.STORAGE: '16g'}, # low1
   3: {DEEPLOY_RESOURCES.CPU: 2, DEEPLOY_RESOURCES.MEMORY: '8g', DEEPLOY_RESOURCES.STORAGE: '32g'}, # low2

extensions/business/deeploy/deeploy_manager_api.py

@@ -447,7 +447,7 @@ def create_pipeline(
                 For CONTAINER_APP_RUNNER:
                   - IMAGE : str (required)
                   - CONTAINER_RESOURCES : dict (required)
-                      - cpu : int
+                      - cpu : int | float
                       - memory : str (e.g., "4096m", "4g")
                   - CR, PORT, ENV, VOLUMES, TUNNEL_ENGINE_ENABLED, etc.
                 For native plugins:

extensions/business/deeploy/deeploy_mixin.py

@@ -728,6 +728,13 @@ def _validate_plugin_instance_for_signature(self, signature: str, plugin_instanc
           f"{DEEPLOY_ERRORS.REQUEST6}. Plugin instance{index_str} with signature '{signature}': 'CONTAINER_RESOURCES.cpu' is required."
         )
 
+      try:
+        self._parse_cpu_value(resources.get(DEEPLOY_RESOURCES.CPU), default=None)
+      except ValueError:
+        raise ValueError(
+          f"{DEEPLOY_ERRORS.REQUEST6}. Plugin instance{index_str} with signature '{signature}': 'CONTAINER_RESOURCES.cpu' must be a number."
+        )
+
       if DEEPLOY_RESOURCES.MEMORY not in resources:
         raise ValueError(
           f"{DEEPLOY_ERRORS.REQUEST6}. Plugin instance{index_str} with signature '{signature}': 'CONTAINER_RESOURCES.memory' is required."
@@ -1087,6 +1094,17 @@ def deeploy_get_auth_result(self, inputs):
     }
     return result
 
+  def _parse_cpu_value(self, value, default=None):
+    """
+    Parse CPU value as float, allowing numeric strings.
+    """
+    if value is None:
+      return default
+    try:
+      return float(value)
+    except (TypeError, ValueError):
+      raise ValueError(f"{DEEPLOY_ERRORS.REQUEST6}. 'CONTAINER_RESOURCES.cpu' must be a number.")
+
   def _aggregate_container_resources(self, inputs):
     """
     Aggregate container resources across all CONTAINER_APP_RUNNER plugin instances.
@@ -1110,11 +1128,17 @@ def _aggregate_container_resources(self, inputs):
       self.Pd("Using legacy format (app_params) for resource aggregation")
       app_params = inputs.get(DEEPLOY_KEYS.APP_PARAMS, {})
       legacy_resources = app_params.get(DEEPLOY_RESOURCES.CONTAINER_RESOURCES, {})
+      if isinstance(legacy_resources, dict):
+        legacy_resources = self.deepcopy(legacy_resources)
+        if DEEPLOY_RESOURCES.CPU in legacy_resources:
+          legacy_resources[DEEPLOY_RESOURCES.CPU] = self._parse_cpu_value(
+            legacy_resources.get(DEEPLOY_RESOURCES.CPU)
+          )
       self.Pd(f"Legacy resources: {legacy_resources}")
       return legacy_resources
 
     self.Pd(f"Processing {len(plugins_array)} plugin instances from plugins array")
-    total_cpu = 0
+    total_cpu = 0.0
     total_memory_mb = 0
 
     # Iterate through plugins array (simplified format - each object is an instance)
@@ -1125,7 +1149,7 @@ def _aggregate_container_resources(self, inputs):
       # Only aggregate for CONTAINER_APP_RUNNER and WORKER_APP_RUNNER plugins
       if signature in CONTAINERIZED_APPS_SIGNATURES:
         resources = plugin_instance.get(DEEPLOY_RESOURCES.CONTAINER_RESOURCES, {})
-        cpu = resources.get(DEEPLOY_RESOURCES.CPU, 0)
+        cpu = self._parse_cpu_value(resources.get(DEEPLOY_RESOURCES.CPU, 0))
         memory = resources.get(DEEPLOY_RESOURCES.MEMORY, "0m")
 
         self.Pd(f"  Container resources: cpu={cpu}, memory={memory}")

extensions/business/deeploy/deeploy_target_nodes_mixin.py

@@ -164,7 +164,10 @@ def __find_suitable_nodes_for_container_app(self, nodes_with_resources, containe
     self.Pd(f"Starting __find_suitable_nodes_for_container_app with {len(nodes_with_resources)} candidate nodes")
     suitable_nodes = {}
 
-    required_cpu = container_requested_resources.get(DEEPLOY_RESOURCES.CPU, DEFAULT_CONTAINER_RESOURCES.CPU)
+    required_cpu = self._parse_cpu_value(
+      container_requested_resources.get(DEEPLOY_RESOURCES.CPU, DEFAULT_CONTAINER_RESOURCES.CPU),
+      default=DEFAULT_CONTAINER_RESOURCES.CPU,
+    )
     required_mem = container_requested_resources.get(DEEPLOY_RESOURCES.MEMORY, DEFAULT_CONTAINER_RESOURCES.MEMORY)
     required_mem_bytes = self._parse_memory(required_mem)
 
@@ -225,10 +228,13 @@ def __find_suitable_nodes_for_container_app(self, nodes_with_resources, containe
         continue
       self.Pd(f"Node {addr} has {self.json_dumps(used_container_resources)} used container resources.")
       # Sum up resources used by node.
-      used_cpu = 0
+      used_cpu = 0.0
       used_memory = 0
       for res in used_container_resources:
-        cpu = int(res.get(DEEPLOY_RESOURCES.CPU, DEFAULT_CONTAINER_RESOURCES.CPU))
+        cpu = self._parse_cpu_value(
+          res.get(DEEPLOY_RESOURCES.CPU, DEFAULT_CONTAINER_RESOURCES.CPU),
+          default=DEFAULT_CONTAINER_RESOURCES.CPU,
+        )
         memory = res.get(DEEPLOY_RESOURCES.MEMORY, DEFAULT_CONTAINER_RESOURCES.MEMORY)
         used_cpu += cpu
         used_memory += self._parse_memory(memory)

ver.py

@@ -1 +1 @@
-__VER__ = '2.9.973'
+__VER__ = '2.9.974'