♻️ Completely remove celery (#2730)

ITISFoundation · Jan 10, 2022 · 875b096 · 875b096
1 parent 5915b3f
commit 875b096
Show file tree

Hide file tree

Showing 63 changed files with 73 additions and 1,046 deletions.
diff --git a/.gitignore b/.gitignore
@@ -78,9 +78,6 @@ target/
 # pyenv
 .python-version
 
-# celery beat schedule file
-celerybeat-schedule
-
 # SageMath parsed files
 *.sage.py
 

diff --git a/ci/helpers/requirements.in b/ci/helpers/requirements.in
@@ -3,7 +3,6 @@
 # Installing these void e.g. E0611: No name 'UploadFile' in module 'fastapi' (no-name-in-module)
 #
 aiohttp
-celery
 docker
 fastapi
 pyjwt
diff --git a/ci/helpers/requirements.txt b/ci/helpers/requirements.txt
@@ -2,42 +2,24 @@
 # This file is autogenerated by pip-compile with python 3.8
 # To update, run:
 #
-#    pip-compile requirements.in
+#    pip-compile --output-file=requirements.txt requirements.in
 #
 aiohttp==3.8.1
     # via -r requirements.in
 aiosignal==1.2.0
     # via aiohttp
-amqp==5.0.6
-    # via kombu
 anyio==3.4.0
     # via starlette
 async-timeout==4.0.1
     # via aiohttp
 attrs==21.2.0
     # via aiohttp
-billiard==3.6.4.0
-    # via celery
-celery==5.2.1
-    # via -r requirements.in
 certifi==2021.10.8
     # via requests
 charset-normalizer==2.0.8
     # via
     #   aiohttp
     #   requests
-click==8.0.3
-    # via
-    #   celery
-    #   click-didyoumean
-    #   click-plugins
-    #   click-repl
-click-didyoumean==0.3.0
-    # via celery
-click-plugins==1.1.1
-    # via celery
-click-repl==0.2.0
-    # via celery
 docker==5.0.3
     # via -r requirements.in
 fastapi==0.70.0
@@ -51,24 +33,16 @@ idna==3.3
     #   anyio
     #   requests
     #   yarl
-kombu==5.2.2
-    # via celery
 multidict==5.2.0
     # via
     #   aiohttp
     #   yarl
-prompt-toolkit==3.0.22
-    # via click-repl
 pydantic==1.8.2
     # via fastapi
 pyjwt==2.3.0
     # via -r requirements.in
-pytz==2021.3
-    # via celery
 requests==2.26.0
     # via docker
-six==1.16.0
-    # via click-repl
 sniffio==1.2.0
     # via anyio
 starlette==0.16.0
@@ -79,17 +53,7 @@ typing-extensions==4.0.0
     #   pydantic
 urllib3==1.26.7
     # via requests
-vine==5.0.0
-    # via
-    #   amqp
-    #   celery
-    #   kombu
-wcwidth==0.2.5
-    # via prompt-toolkit
 websocket-client==1.2.1
     # via docker
 yarl==1.7.2
     # via aiohttp
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools
diff --git a/packages/models-library/src/models_library/settings/celery.py b/packages/models-library/src/models_library/settings/celery.py
diff --git a/packages/postgres-database/src/simcore_postgres_database/models/comp_pipeline.py b/packages/postgres-database/src/simcore_postgres_database/models/comp_pipeline.py
@@ -15,8 +15,6 @@ class StateType(enum.Enum):
     NOTE: these states are the exact same ones as the models-library (RunningState for a project's execution state)
     """
 
-    # TODO: how they map to celery.states?
-    # https://docs.celeryproject.org/en/stable/reference/celery.states.html
     NOT_STARTED = "NOT_STARTED"
     PUBLISHED = "PUBLISHED"
     PENDING = "PENDING"

diff --git a/packages/postgres-database/src/simcore_postgres_database/models/comp_tasks.py b/packages/postgres-database/src/simcore_postgres_database/models/comp_tasks.py
@@ -36,7 +36,7 @@ class NodeClass(enum.Enum):
         sa.Enum(NodeClass),
         doc="Classification of the node associated to this task",
     ),
-    sa.Column("job_id", sa.String, doc="Celery ID for this task"),
+    sa.Column("job_id", sa.String, doc="Worker job ID for this task"),
     sa.Column("internal_id", sa.Integer, doc="DEV: only for development. From 1 to N"),
     sa.Column("schema", sa.JSON, doc="Schema for inputs and outputs"),
     sa.Column("inputs", sa.JSON, doc="Input values"),

diff --git a/packages/pytest-simcore/requirements/tests_base.txt b/packages/pytest-simcore/requirements/tests_base.txt
@@ -18,4 +18,3 @@ pytest-lazy-fixture
 
 # support testing features built on frameworks
 # pytest-docker
-# pytest-celery
diff --git a/packages/pytest-simcore/setup.py b/packages/pytest-simcore/setup.py
@@ -24,7 +24,6 @@
             "aio-pika",
             "aiohttp",
             "aioredis",
-            "celery",
             "docker",
             "python-socketio",
             "PyYAML",

diff --git a/packages/pytest-simcore/src/pytest_simcore/celery_service.py b/packages/pytest-simcore/src/pytest_simcore/celery_service.py
diff --git a/packages/service-library/src/servicelib/celery_utils.py b/packages/service-library/src/servicelib/celery_utils.py
diff --git a/packages/settings-library/src/settings_library/celery.py b/packages/settings-library/src/settings_library/celery.py
diff --git a/services/api-server/src/simcore_service_api_server/models/schemas/jobs.py b/services/api-server/src/simcore_service_api_server/models/schemas/jobs.py
@@ -197,11 +197,11 @@ def compose_resource_name(
 
     @property
     def resource_name(self) -> str:
-        """ Relative Resource Name """
+        """Relative Resource Name"""
         return self.name
 
 
-# TODO: these need to be in sync with celery task states
+# TODO: these need to be in sync with computational task states
 class TaskStates(str, Enum):
     UNKNOWN = "UNKNOWN"
     PUBLISHED = "PUBLISHED"

diff --git a/services/director-v2/requirements/_base.in b/services/director-v2/requirements/_base.in
@@ -21,7 +21,6 @@
 aio-pika
 aiodocker
 aiopg[sa]
-celery[redis]
 dask-gateway
 fastapi[all]
 httpx
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ @@
     # Installing these void e.g. E0611: No name 'UploadFile' in module 'fastapi' (no-name-in-module)
     #
     aiohttp
-    celery
     docker
     fastapi
     pyjwt
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,4 +18,3 @@ pytest-lazy-fixture

		# support testing features built on frameworks
		# pytest-docker
		# pytest-celery