Revert "fix celery worker profile for s3 access (#333)" (#345)

yixu34 · web-flow · commit f2c253ffb910 · 2023-10-23T14:32:21.000-07:00
This reverts commit fe24d63.
diff --git a/model-engine/model_engine_server/core/celery/app.py b/model-engine/model_engine_server/core/celery/app.py
@@ -504,7 +504,8 @@ def _get_backend_url_and_conf(
     elif backend_protocol == "s3":
         backend_url = "s3://"
         if aws_role is None:
-            aws_session = session(infra_config().profile_ml_worker)
+            aws_profile = os.getenv("AWS_PROFILE", infra_config().profile_ml_worker)
+            aws_session = session(aws_profile)
         else:
             aws_session = session(aws_role)
         out_conf_changes.update(
diff --git a/model-engine/model_engine_server/inference/forwarding/celery_forwarder.py b/model-engine/model_engine_server/inference/forwarding/celery_forwarder.py
@@ -95,7 +95,6 @@ def create_celery_service(
     app: Celery = celery_app(
         name=None,
         s3_bucket=infra_config().s3_bucket,
-        aws_role=infra_config().profile_ml_inference_worker,
         task_visibility=task_visibility,
         broker_type=str(BrokerType.SQS.value if sqs_url else BrokerType.REDIS.value),
         broker_transport_options={"predefined_queues": {queue_name: {"url": sqs_url}}}
diff --git a/model-engine/model_engine_server/infra/gateways/celery_task_queue_gateway.py b/model-engine/model_engine_server/infra/gateways/celery_task_queue_gateway.py
@@ -11,7 +11,9 @@
 from model_engine_server.domain.gateways.task_queue_gateway import TaskQueueGateway
 
 celery_redis = celery_app(
-    None, s3_bucket=infra_config().s3_bucket, broker_type=str(BrokerType.REDIS.value)
+    None,
+    s3_bucket=infra_config().s3_bucket,
+    broker_type=str(BrokerType.REDIS.value),
 )
 celery_redis_24h = celery_app(
     None,
