rename {native/symphony/...}_worker_adapter to worker_manager_{native/symphony/...}

Author: I-Need-Sleep-Asap

README.md

@@ -233,8 +233,8 @@ The following table maps each Scaler command to its corresponding section name i
 | `scaler_object_storage_server`   | `[object_storage_server]`  |
 | `scaler_ui`                      | `[webui]`                  |
 | `scaler_top`                     | `[top]`                    |
-| `scaler_worker_adapter_native`   | `[native_worker_adapter]`  |
-| `scaler_worker_adapter_symphony` | `[symphony_worker_adapter]`|
+| `scaler_worker_manager_native`   | `[worker_manager_native]`  |
+| `scaler_worker_manager_symphony` | `[worker_manager_symphony]`|
 
 ### Practical Scenarios & Examples
 
@@ -363,7 +363,7 @@ might be added in the future.
 A Scaler scheduler can interface with IBM Spectrum Symphony to provide distributed computing across Symphony clusters.
 
 ```bash
-$ scaler_worker_adapter_symphony tcp://127.0.0.1:2345 --service-name ScalerService --base-concurrency 4 --host 127.0.0.1 --port 8080
+$ scaler_worker_manager_symphony tcp://127.0.0.1:2345 --service-name ScalerService --base-concurrency 4 --host 127.0.0.1 --port 8080
 ```
 
 This will start a Scaler worker that connects to the Scaler scheduler at `tcp://127.0.0.1:2345` and uses the Symphony
@@ -448,31 +448,31 @@ where `deepest_nesting_level` is the deepest nesting level a task has in your wo
 workload that has
 a base task that calls a nested task that calls another nested task, then the deepest nesting level is 2.
 
-## Worker Adapter usage
+## Worker Manager usage
 
 > **Note**: This feature is experimental and may change in future releases.
 
-Scaler provides a Worker Adapter webhook interface to integrate with other job schedulers or resource managers. The
-Worker Adapter allows external systems to request the creation and termination of Scaler workers dynamically.
+Scaler provides a Worker Manager webhook interface to integrate with other job schedulers or resource managers. The
+Worker Manager allows external systems to request the creation and termination of Scaler workers dynamically.
 
-Please check the OpenGRIS standard for more details on the Worker Adapter
+Please check the OpenGRIS standard for more details on the Worker Manager
 specification [here](https://github.com/finos/opengris).
 
-### Starting the Native Worker Adapter
+### Starting the Native Worker Manager
 
-Starting a Native Worker Adapter server at `http://127.0.0.1:8080`:
+Starting a Native Worker Manager server at `http://127.0.0.1:8080`:
 
 ```bash
-$ scaler_worker_adapter_native tcp://127.0.0.1:2345 --host 127.0.0.1 --port 8080
+$ scaler_worker_manager_native tcp://127.0.0.1:2345 --host 127.0.0.1 --port 8080
 ```
 
-Pass the `--adapter-webhook-url` argument to the Scaler scheduler to connect to the Worker Adapter:
+Pass the `--manager-webhook-url` argument to the Scaler scheduler to connect to the Worker Manager:
 
 ```bash
-$ scaler_scheduler tcp://127.0.0.1:2345 --adapter-webhook-url http://127.0.0.1:8080
+$ scaler_scheduler tcp://127.0.0.1:2345 --manager-webhook-url http://127.0.0.1:8080
 ````
 
-To check that the Worker Adapter is working, you can bring up `scaler_top` to see workers spawning and terminating as
+To check that the Worker Manager is working, you can bring up `scaler_top` to see workers spawning and terminating as
 there is task load changes.
 
 ## Performance

docs/source/tutorials/configuration.rst

@@ -179,10 +179,10 @@ The following table maps each Scaler command to its corresponding section name i
      - ``[webui]``
    * - ``scaler_top``
      - ``[top]``
-   * - ``scaler_worker_adapter_native``
-     - ``[native_worker_adapter]``
-   * - ``scaler_worker_adapter_symphony``
-     - ``[symphony_worker_adapter]``
+   * - ``scaler_worker_manager_native``
+     - ``[worker_manager_native]``
+   * - ``scaler_worker_manager_symphony``
+     - ``[worker_manager_symphony]``
 
 
 Practical Scenarios & Examples

pyproject.toml

@@ -72,8 +72,8 @@ scaler_cluster = "scaler.entry_points.cluster:main"
 scaler_top = "scaler.entry_points.top:main"
 scaler_ui = "scaler.entry_points.webui:main"
 scaler_object_storage_server = "scaler.entry_points.object_storage_server:main"
-scaler_worker_adapter_native = "scaler.entry_points.worker_adapter_native:main"
-scaler_worker_adapter_symphony = "scaler.entry_points.worker_adapter_symphony:main"
+scaler_worker_manager_native = "scaler.entry_points.worker_manager_native:main"
+scaler_worker_manager_symphony = "scaler.entry_points.worker_manager_symphony:main"
 
 [tool.scikit-build]
 cmake.source-dir = "."

run_worker_adapter_native.py renamed to run_worker_manager_native.py

@@ -1,4 +1,4 @@
-from scaler.entry_points.worker_adapter_native import main
+from scaler.entry_points.worker_manager_native import main
 from scaler.utility.debug import pdb_wrapped
 
 if __name__ == "__main__":

run_worker_adapter_symphony.py renamed to run_worker_manager_symphony.py

@@ -1,4 +1,4 @@
-from scaler.entry_points.worker_adapter_symphony import main
+from scaler.entry_points.worker_manager_symphony import main
 from scaler.utility.debug import pdb_wrapped
 
 if __name__ == "__main__":

scaler/cluster/combo.py

@@ -110,7 +110,7 @@ def __init__(
             io_threads=scheduler_io_threads,
             max_number_of_tasks_waiting=max_number_of_tasks_waiting,
             client_timeout_seconds=client_timeout_seconds,
-            adapter_webhook_url=None,
+            manager_webhook_url=None,
             worker_timeout_seconds=worker_timeout_seconds,
             object_retention_seconds=object_retention_seconds,
             load_balance_seconds=load_balance_seconds,

scaler/cluster/scheduler.py

@@ -19,7 +19,7 @@ def __init__(
         address: ZMQConfig,
         storage_address: Optional[ObjectStorageConfig],
         monitor_address: Optional[ZMQConfig],
-        adapter_webhook_url: Optional[str],
+        manager_webhook_url: Optional[str],
         io_threads: int,
         max_number_of_tasks_waiting: int,
         client_timeout_seconds: int,
@@ -40,7 +40,7 @@ def __init__(
             scheduler_address=address,
             object_storage_address=storage_address,
             monitor_address=monitor_address,
-            adapter_webhook_url=adapter_webhook_url,
+            manager_webhook_url=manager_webhook_url,
             io_threads=io_threads,
             max_number_of_tasks_waiting=max_number_of_tasks_waiting,
             client_timeout_seconds=client_timeout_seconds,

scaler/config/section/scheduler.py

@@ -15,7 +15,7 @@ class SchedulerConfig:
     scheduler_address: ZMQConfig = dataclasses.field()
     object_storage_address: Optional[ObjectStorageConfig] = None
     monitor_address: Optional[ZMQConfig] = None
-    adapter_webhook_url: Optional[str] = None
+    manager_webhook_url: Optional[str] = None
     protected: bool = True
     allocate_policy: AllocatePolicy = AllocatePolicy.even
     event_loop: str = "builtin"
@@ -44,10 +44,10 @@ def __post_init__(self):
             raise ValueError("All timeout/retention/balance second values must be positive.")
         if self.load_balance_trigger_times <= 0:
             raise ValueError("load_balance_trigger_times must be a positive integer.")
-        if self.adapter_webhook_url:
-            parsed_url = urlparse(self.adapter_webhook_url)
+        if self.manager_webhook_url:
+            parsed_url = urlparse(self.manager_webhook_url)
             if not all([parsed_url.scheme, parsed_url.netloc]):
-                raise ValueError(f"adapter_webhook_url '{self.adapter_webhook_url}' is not a valid URL.")
+                raise ValueError(f"manager_webhook_url '{self.manager_webhook_url}' is not a valid URL.")
         valid_levels = {level.name for level in LoggingLevel}
         if self.logging_level.upper() not in valid_levels:
             raise ValueError(f"logging_level must be one of {valid_levels}, but got '{self.logging_level}'")

scaler/config/section/native_worker_adapter.py renamed to scaler/config/section/worker_manager_native.py

@@ -9,11 +9,11 @@
 
 
 @dataclasses.dataclass
-class NativeWorkerAdapterConfig:
+class WorkerManagerNativeConfig:
     scheduler_address: ZMQConfig
     storage_address: Optional[ObjectStorageConfig] = None
-    adapter_web_host: str = "localhost"
-    adapter_web_port: int = 8080
+    manager_web_host: str = "localhost"
+    manager_web_port: int = 8080
     per_worker_capabilities: WorkerCapabilities = dataclasses.field(
         default_factory=lambda: WorkerCapabilities.from_string("")
     )
@@ -32,10 +32,10 @@ class NativeWorkerAdapterConfig:
     logging_config_file: Optional[str] = None
 
     def __post_init__(self):
-        if not isinstance(self.adapter_web_host, str):
-            raise TypeError(f"adapter_web_host should be string, given {self.adapter_web_host}")
-        if not isinstance(self.adapter_web_port, int):
-            raise TypeError(f"adapter_web_port must be between 1 and 65535, but got {self.adapter_web_port}")
+        if not isinstance(self.manager_web_host, str):
+            raise TypeError(f"manager_web_host should be string, given {self.manager_web_host}")
+        if not isinstance(self.manager_web_port, int):
+            raise TypeError(f"manager_web_port must be between 1 and 65535, but got {self.manager_web_port}")
         if self.io_threads <= 0:
             raise ValueError("io_threads must be a positive integer.")
         if self.worker_task_queue_size <= 0:

scaler/config/section/symphony_worker_adapter.py renamed to scaler/config/section/worker_manager_symphony.py

@@ -9,7 +9,7 @@
 
 
 @dataclasses.dataclass
-class SymphonyWorkerConfig:
+class WorkerManagerSymphonyConfig:
     scheduler_address: ZMQConfig
     object_storage_address: Optional[ObjectStorageConfig]
     service_name: str