add proxy_server key to stores config, use it in interface

Author: MaxFBurg

datajoint/s3.py

@@ -18,18 +18,20 @@ def __init__(self, endpoint, bucket, access_key, secret_key, *, secure=False, pr
         # proxy_server: string, like "https://PROXYSERVER:PROXYPORT/"
         # self.client = minio.Minio(endpoint, access_key=access_key, secret_key=secret_key,
         #                           secure=secure)
-        # TODO implement proxy_server argument
-        http_client = urllib3.ProxyManager(
-                "http://www-cache.gwdg.de:3128",
-                timeout=urllib3.Timeout.DEFAULT_TIMEOUT,
-                cert_reqs="CERT_REQUIRED",
-                retries=urllib3.Retry(
-                    total=5,
-                    backoff_factor=0.2,
-                    status_forcelist=[500, 502, 503, 504],
+        if proxy_server:  # "http://www-cache.gwdg.de:3128"
+            http_client = urllib3.ProxyManager(
+                    proxy_server,
+                    timeout=urllib3.Timeout.DEFAULT_TIMEOUT,
+                    cert_reqs="CERT_REQUIRED",
+                    retries=urllib3.Retry(
+                        total=5,
+                        backoff_factor=0.2,
+                        status_forcelist=[500, 502, 503, 504],
+                    )
                 )
-            )
-        print('DEBUG http_client')
+        else:
+            http_client = None
+
         self.client = minio.Minio(
             endpoint,
             access_key=access_key,

datajoint/settings.py

@@ -138,7 +138,7 @@ def get_store_spec(self, store):
         spec['subfolding'] = spec.get('subfolding', DEFAULT_SUBFOLDING)
         spec_keys = {  # REQUIRED in uppercase and allowed in lowercase
             'file': ('PROTOCOL', 'LOCATION', 'subfolding', 'stage'),
-            's3': ('PROTOCOL', 'ENDPOINT', 'BUCKET', 'ACCESS_KEY', 'SECRET_KEY', 'LOCATION', 'secure', 'subfolding', 'stage')}
+            's3': ('PROTOCOL', 'ENDPOINT', 'BUCKET', 'ACCESS_KEY', 'SECRET_KEY', 'LOCATION', 'secure', 'subfolding', 'stage', 'proxy_server')}
 
         try:
             spec_keys = spec_keys[spec.get('protocol', '').lower()]