Update Compute Adapter to Version 1.1

compute_adapter.py

@@ -1,65 +1,99 @@
 # =====================================================
 # Apckeyl Framework
-# Version 1.0
+# Version 1.1
 # compute_adapter.py
 # =====================================================
 
 """
-Apckeyl Compute Adapter.
+Compute Adapter.
 
-Version 1.0
+Version 1.1
 
-Adapter является прослойкой между
-Control Plane / Dispatcher и внешним
-Compute Module.
+Адаптер между Apckeyl Framework
+и конкретным Compute Module.
 
-На этом этапе реальное сетевое
-подключение НЕ выполняется.
+На этом этапе реальный внешний модуль
+Apckeyl_RealESRGAN ещё НЕ подключается.
 """
 
+from compute_module import ComputeModule
+
 
 # =====================================================
-# Base Compute Adapter
+# Compute Adapter
 # =====================================================
 
 class ComputeAdapter:
 
     def __init__(
         self,
-        module_id,
-        module_name,
-        endpoint=None,
+        compute_module,
     ):
 
-        self.module_id = module_id
+        if compute_module is None:
 
-        self.module_name = module_name
+            raise ValueError(
+                "compute_module is required"
+            )
 
-        self.endpoint = endpoint
+        if not isinstance(
+            compute_module,
+            ComputeModule,
+        ):
+
+            raise TypeError(
+                "compute_module must be "
+                "an instance of ComputeModule"
+            )
+
+        self.compute_module = (
+            compute_module
+        )
 
 
     # =================================================
     # Module Information
     # =================================================
 
-    def get_info(self):
+    def get_module_info(self):
 
-        return {
+        return (
+            self.compute_module.get_info()
+        )
 
-            "module_id": self.module_id,
 
-            "module_name": self.module_name,
+    # =================================================
+    # Health Check
+    # =================================================
 
-            "endpoint": self.endpoint,
+    def health_check(self):
 
-        }
+        return (
+            self.compute_module.health_check()
+        )
+
+
+    # =================================================
+    # Task Support
+    # =================================================
+
+    def supports_task(
+        self,
+        task_type,
+    ):
+
+        return (
+            self.compute_module.supports_task(
+                task_type
+            )
+        )
 
 
     # =================================================
-    # Dispatch
+    # Execute Task
     # =================================================
 
-    def dispatch(
+    def execute(
         self,
         task,
     ):
@@ -70,7 +104,6 @@ class ComputeAdapter:
                 "Task cannot be None"
             )
 
-
         if not isinstance(
             task,
             dict,
@@ -80,7 +113,6 @@ class ComputeAdapter:
                 "Task must be a dictionary"
             )
 
-
         task_id = task.get(
             "task_id"
         )
@@ -91,56 +123,41 @@ class ComputeAdapter:
                 "Task must contain task_id"
             )
 
+        task_type = task.get(
+            "task_type"
+        )
 
-        return {
-
-            "status": "prepared",
-
-            "module_id": self.module_id,
+        if not task_type:
 
-            "module_name": self.module_name,
+            raise ValueError(
+                "Task must contain task_type"
+            )
 
-            "task_id": task_id,
+        if not self.supports_task(
+            task_type
+        ):
 
-            "task_type": task.get(
-                "task_type"
-            ),
+            raise ValueError(
 
-            "payload": task.get(
-                "payload"
-            ),
+                f"Unsupported task type: "
+                f"{task_type}"
+            )
 
-        }
+        return (
+            self.compute_module.execute(
+                task
+            )
+        )
 
 
 # =====================================================
-# RealESRGAN Adapter
+# Adapter Factory
 # =====================================================
 
-class RealESRGANAdapter(
-    ComputeAdapter
+def create_compute_adapter(
+    compute_module,
 ):
 
-    def __init__(
-        self,
-        endpoint=None,
-    ):
-
-        super().__init__(
-
-            module_id="realesrgan",
-
-            module_name="Apckeyl_RealESRGAN",
-
-            endpoint=endpoint,
-
-        )
-
-
-# =====================================================
-# Default Adapter
-# =====================================================
-
-realesrgan_adapter = (
-    RealESRGANAdapter()
-)
+    return ComputeAdapter(
+        compute_module
+    )