Merge pull request #23 from chicagopcdc/pcdc_dev

Pcdc dev

Author: grugna

pelican/graphql/base_gql.py

@@ -8,14 +8,25 @@ def __init__(self, node, hostname, access_token):
         self.hostname = hostname
         self.url = None
         self.access_token = access_token
-        self.headers = {"Authorization": f"Bearer {self.access_token}",  "Content-Type": "application/json"}
+        self.headers = {
+            "Authorization": f"Bearer {self.access_token}",
+            "Content-Type": "application/json",
+        }
 
     def execute(self, filters=None):
         raise NotImplementedError
 
     def _execute(self, query):
+        # Ensure that the variables are encoded for the POST request
+        var = query["variables"]
+        var = json.loads(var)
+        query["variables"] = var
+
+        return self._send_request(query)
+
+    def _send_request(self, query):
         r = requests.post(self.url, json=query, headers=self.headers)
-        
+
         if r.status_code == 200:
             return r.json()
         else:

pelican/graphql/guppy_gql.py

@@ -1,4 +1,5 @@
 import json
+import requests
 
 from .base_gql import BaseGQL
 
@@ -13,10 +14,6 @@ def _count(self, filters=None):
         query_json = {"query": query}
         if filters:
             query_json["variables"] = filters
-            # Ensure that the variables are encoded for the POST request
-            var = query_json["variables"]
-            var = json.loads(var)
-            query_json["variables"] = var
 
         r = BaseGQL._execute(self, query_json)
         try:
@@ -35,7 +32,8 @@ def _download_endpoint(self, filters=None):
         }
         if filters:
             query.update(json.loads(filters))
-        r = BaseGQL._execute(self, query)
+
+        r = BaseGQL._send_request(self, query)
         return r
 
     def _graphql_endpoint(self, filters=None):
@@ -44,11 +42,6 @@ def _graphql_endpoint(self, filters=None):
         query_json = {"query": query}
         if filters:
             query_json["variables"] = filters
-            # Ensure that the variables are encoded for the POST request
-            var = query_json["variables"]
-            var = json.loads(var)
-            query_json["variables"] = var
-            
         r = BaseGQL._execute(self, query_json)
         try:
             r = r["data"][self.node]
@@ -62,10 +55,6 @@ def _graphql_auth_resource_path(self, filters=None):
         query_json = {"query": query}
         if filters:
             query_json["variables"] = filters
-            # Ensure that the variables are encoded for the POST request
-            var = query_json["variables"]
-            var = json.loads(var)
-            query_json["variables"] = var
         r = BaseGQL._execute(self, query_json)
         try:
             r = r["data"][self.node]

pelican/s3.py

@@ -2,6 +2,7 @@
 
 import boto3
 from botocore.exceptions import ClientError
+from botocore.config import Config
 
 
 def s3upload_file(
@@ -17,10 +18,12 @@ def s3upload_file(
     :param expiration:
     :return: presigned URL on success, False on failure
     """
+    config = Config(signature_version="s3v4")
     client = boto3.client(
         "s3",
         aws_access_key_id=aws_access_key_id,
         aws_secret_access_key=aws_secret_access_key,
+        config=config,
     )
 
     client.upload_file(filepath, bucket, key)