fix headers maybe

Author: matthewhanson

pystac_client/cli.py

@@ -14,11 +14,11 @@
 logger = logging.getLogger(__name__)
 
 
-def search(url=STAC_URL, matched=False, save=None, **kwargs):
+def search(url=STAC_URL, matched=False, save=None, headers=None, **kwargs):
     """ Main function for performing a search """
 
     try:
-        catalog = Client.open(url)
+        catalog = Client.open(url, headers=headers)
         search = catalog.search(**kwargs)
 
         if matched:
@@ -51,7 +51,7 @@ def parse_args(args):
     parent.add_argument('--url', help='Root Catalog URL', default=os.getenv('STAC_URL', None))
     parent.add_argument('--limit', help='Page size limit', type=int, default=500)
     parent.add_argument('--headers',
-                        help='Additional request headers (JSON file or string)',
+                        help='Additional request headers (JSON string)',
                         default=None)
 
     subparsers = parser0.add_subparsers(dest='command')
@@ -106,6 +106,10 @@ def parse_args(args):
                 else:
                     parsed_args['intersects'] = data
 
+    # if headers provided, parse it
+    if 'headers' in parsed_args:
+        parsed_args['headers'] = json.loads(parsed_args['headers'])
+
     return parsed_args
 
 

pystac_client/client.py

@@ -48,7 +48,8 @@ def __init__(self,
                  extra_fields=None,
                  href=None,
                  catalog_type=None,
-                 conformance=None):
+                 conformance=None,
+                 headers=None):
         super().__init__(id=id,
                          description=description,
                          title=title,
@@ -66,7 +67,7 @@ def __init__(self,
                 'API does not conform to {ConformanceClasses.STAC_API_CORE}. Must contain one of the following '
                 f'URIs to conform (preferably the first):\n\t{allowed_uris}.')
 
-        self.headers = {}
+        self.headers = headers
 
     def __repr__(self):
         return '<Catalog id={}>'.format(self.id)