Fixes for making this plugin work with stable covalent

.github/workflows/docker.yml

@@ -74,6 +74,7 @@ jobs:
         with:
           persist-credentials: false
           fetch-depth: 0
+          ref: further-fixes-for-release
 
       - name: Setup QEMU
         uses: docker/setup-qemu-action@v2

Dockerfile

@@ -9,10 +9,10 @@ RUN apt-get update && apt-get install -y \
   gcc \
   && rm -rf /var/lib/apt/lists/*
 
-RUN pip install --no-cache-dir --upgrade \
-  amazon-braket-pennylane-plugin==1.6.9 \
-  boto3==1.20.48 \
-  pennylane==0.24.0 \
+RUN pip install --no-cache-dir \
+  boto3==1.28.5 \
+  pennylane==0.31.1 \
+  amazon-braket-pennylane-plugin==1.17.4 \
   sagemaker-training
 
 RUN if [ -z "$PRE_RELEASE" ]; then \

covalent_braket_plugin/assets/infra/main.tf

@@ -27,7 +27,7 @@ resource "aws_s3_bucket" "braket_bucket" {
 }
 
 resource "aws_ecr_repository" "braket_ecr_repo" {
-  name                 = "${var.name}-base-executor-repo"
+  name                 = "amazon-braket-${var.name}-base-executor-repo"
   image_tag_mutability = "MUTABLE"
 
   force_delete = true
@@ -41,7 +41,7 @@ resource "aws_ecr_repository" "braket_ecr_repo" {
 }
 
 resource "aws_iam_role" "braket_iam_role" {
-  name = "${var.name}-role"
+  name = "amazon-braket-${var.name}-role"
   assume_role_policy = jsonencode({
     Version = "2012-10-17"
     Statement = [

covalent_braket_plugin/assets/infra/variables.tf

@@ -14,9 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Prefix this "name" with something unique for your deployment
+# Prefix this "name" with something unique for your deployment.
+# This is used in addition to the `amazon-braket` prefix to ensure uniqueness, for e.g. the full name will be `amazon-braket-<name>-bucket` for S3 bucket name.
 variable "name" {
-  default     = "covalent-braket"
+  default     = "sankalp-covalent"
   description = "Name to be used in the new provisioned resources"
 }
 

covalent_braket_plugin/braket.py

@@ -22,21 +22,20 @@
 import tempfile
 from functools import partial
 from pathlib import Path
-from typing import Any, Callable, Dict, List, Tuple
+from typing import Any, Callable, Dict, List
 
 import boto3
 import botocore
 import cloudpickle as pickle
 from covalent._shared_files.config import get_config
 from covalent._shared_files.exceptions import TaskCancelledError
 from covalent._shared_files.logger import app_log
-from covalent._workflow.transport import TransportableObject
 from covalent_aws_plugins import AWSExecutor
 
 _EXECUTOR_PLUGIN_DEFAULTS = {
-    "credentials": "",
-    "profile": "",
-    "region": "",
+    "credentials": "~/.aws/credentials",
+    "profile": "default",
+    "region": "us-east-1",
     "s3_bucket_name": os.environ.get("BRAKET_COVALENT_S3")
     or "amazon-braket-covalent-job-resources",
     "ecr_image_uri": "",
@@ -280,9 +279,7 @@ async def query_result(self, query_metadata: Dict) -> Any:
         )
         events = all_log_events["events"]
 
-        log_events = ""
-        for event in events:
-            log_events += event["message"] + "\n"
+        log_events = "".join(event["message"] + "\n" for event in events)
 
         # output, stdout, stderr
         return result, log_events, ""

requirements.txt

@@ -1,3 +1,3 @@
-amazon-braket-pennylane-plugin==1.6.9
-boto3==1.24.35
-covalent-aws-plugins>=0.12.0,<1
+amazon-braket-pennylane-plugin>=1.17.4
+boto3>=1.28.5
+covalent-aws-plugins>=0.19.0,<1