Change "Task" to "Method" to be consistent with queues

exalearn · Mar 8, 2024 · fb4f848 · fb4f848
1 parent d9e2f73
commit fb4f848
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 343 deletions.
diff --git a/colmena/models/tasks.py b/colmena/models/tasks.py
diff --git a/colmena/task_server/base.py b/colmena/task_server/base.py
@@ -7,7 +7,7 @@
 from typing import Collection, Optional, Callable, Union
 
 from colmena.exceptions import KillSignalException, TimeoutException
-from colmena.models.tasks import ColmenaTask, PythonGeneratorTask, PythonTask
+from colmena.models.methods import ColmenaMethod, PythonGeneratorMethod, PythonMethod
 from colmena.models import Result, FailureInformation
 from colmena.queue.base import ColmenaQueues
 
@@ -161,7 +161,7 @@ def process_queue(self, topic: str, task: Result):
             future.add_done_callback(lambda x: self.perform_callback(x, task, topic))
 
 
-def convert_to_colmena_task(function: Union[Callable, ColmenaTask]) -> ColmenaTask:
+def convert_to_colmena_method(function: Union[Callable, ColmenaMethod]) -> ColmenaMethod:
     """Wrap user-supplified functions in the task model wrapper, if needed
 
     Args:
@@ -170,9 +170,9 @@ def convert_to_colmena_task(function: Union[Callable, ColmenaTask]) -> ColmenaTa
         Function as appropriate subclasses of Colmena Task wrapper
     """
 
-    if isinstance(function, ColmenaTask):
+    if isinstance(function, ColmenaMethod):
         return function
     elif isgeneratorfunction(function):
-        return PythonGeneratorTask(function)
+        return PythonGeneratorMethod(function)
     else:
-        return PythonTask(function)
+        return PythonMethod(function)
diff --git a/colmena/task_server/globus.py b/colmena/task_server/globus.py
@@ -10,7 +10,7 @@
 
 from globus_compute_sdk import Client, Executor
 
-from colmena.task_server.base import convert_to_colmena_task, FutureBasedTaskServer
+from colmena.task_server.base import convert_to_colmena_method, FutureBasedTaskServer
 from colmena.queue.python import PipeQueues
 
 from colmena.models import Result
@@ -58,7 +58,7 @@ def __init__(self,
         self.registered_funcs: Dict[str, Tuple[str, str]] = {}  # Function name -> (funcX id, endpoints)
         for func, endpoint in methods.items():
             # Register a wrapped version of the function
-            task = convert_to_colmena_task(func)
+            task = convert_to_colmena_method(func)
             func_fxid = self.fx_client.register_function(task)
 
             # Store the information for the function