0.4.9.2

Author: ninthreezy

datatorch/agent/__init__.py

@@ -150,5 +150,5 @@ async def stop() -> None:
     logger.info("Closing all other tasks.")
     await _exit_tasks()
 
-    loop = asyncio.get_event_loop()
+    loop = asyncio.get_running_loop()
     loop.stop()

datatorch/agent/agent.py

@@ -40,15 +40,15 @@ def _init_logger(self):
 
     def _init_threads(self):
         self.system_stats = AgentSystemStats(self)
-        loop = asyncio.get_event_loop()
+        loop = asyncio.get_running_loop()
         task = loop.create_task(self.system_stats.start())
         tasks.append(task)
 
     async def process_loop(self):
         """Waits for jobs from server."""
         logger.info("Waiting for jobs.")
         async for job_request in self.api.agent_jobs():
-            loop = asyncio.get_event_loop()
+            loop = asyncio.get_running_loop()
             job = job_request.get("job")
             task = loop.create_task(self._run_job(job))
             tasks.append(task)

datatorch/agent/monitoring.py

@@ -90,7 +90,7 @@ async def _task_monitoring(self):
         while True:
             self.sample += 1
             stats = self.stats()
-            loop = asyncio.get_event_loop()
+            loop = asyncio.get_running_loop()
             if self.sample != 1:
                 loop.create_task(self.agent.api.metrics(stats))
             await asyncio.sleep(self.sample_rate)

datatorch/cli/action/run.py

@@ -69,5 +69,4 @@ async def run_action():
             json.dumps(output, indent=4, sort_keys=True) if output else "No output."
         )
 
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run_action())
+    asyncio.run(run_action())

datatorch/cli/agent/start.py

@@ -1,14 +1,13 @@
 import click
 import asyncio
-import functools
 import signal
 
 from asyncio.events import AbstractEventLoop
 from datatorch import agent
 
 
 def add_signal_handlers(loop: AbstractEventLoop):
-    exit_func = functools.partial(asyncio.ensure_future, agent.stop())
+    exit_func = lambda: loop.create_task(agent.stop())
     try:
         loop.add_signal_handler(signal.SIGINT, exit_func)
         loop.add_signal_handler(signal.SIGTERM, exit_func)
@@ -18,7 +17,8 @@ def add_signal_handlers(loop: AbstractEventLoop):
 
 @click.command(help="Run an agent")
 def start():
-    loop = asyncio.get_event_loop()
-    asyncio.ensure_future(agent.start())
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
+    loop.create_task(agent.start())
     add_signal_handlers(loop)
     loop.run_forever()

datatorch/cli/pipeline/run.py

@@ -27,5 +27,4 @@ async def run_jobs(pipeline: Pipeline):
 
         await asyncio.wait(tasks)
 
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(run_jobs(Pipeline.from_yaml(path)))
+    asyncio.run(run_jobs(Pipeline.from_yaml(path)))

requirements.txt

@@ -1,4 +1,4 @@
-Click==8.0.0
+Click==8.4.0
 gql
 websockets
 websocket-client

setup.py

@@ -8,7 +8,7 @@
     long_description = fp.read()
 
 requirements = [
-    "Click==8.0.0",
+    "Click==8.4.0",
     "gql==3.4.0",
     "websockets==10.4",
     "websocket-client",
@@ -33,7 +33,7 @@
 
 setup(
     name="datatorch",
-    version="0.4.9.1",
+    version="0.4.9.2",
     description="A CLI and library for interacting with DataTorch.",
     author="DataTorch",
     author_email="support@datatorch.io",