Merge pull request #45 from eodms-sgdot/development

Development

Author: keballantyne

eodms_cli.code-workspace

@@ -0,0 +1,77 @@
+{
+	"folders": [
+		{
+			"path": "."
+		},
+		{
+			"name": "eodms-prod-stac-access",
+			"path": "../../eodms-stac-api/lambda/_eodms-prod-stac-access_wksp/eodms-prod-stac-access"
+		},
+		{
+			"name": "eodms-staging-stac",
+			"path": "../../eodms-stac-api/lambda/_eodms-staging-stac_wksp/eodms-staging-stac"
+		},
+		{
+			"name": "_eodms-staging-stac_wksp",
+			"path": "../../eodms-stac-api/lambda/_eodms-staging-stac_wksp"
+		},
+		{
+			"name": "_eodms-prod-stac-access_wksp",
+			"path": "../../eodms-stac-api/lambda/_eodms-prod-stac-access_wksp"
+		},
+		{
+			"name": "eodms-prod-stac-20231109",
+			"path": "../../eodms-stac-api/lambda/eodms-prod-stac-20231109"
+		}
+	],
+	"settings": {},
+	"launch": {
+		"configurations": [
+			{
+				"type": "aws-sam",
+				"request": "direct-invoke",
+				"name": "eodms-staging-stac:lambda_function.lambda_handler (python3.9)",
+				"invokeTarget": {
+					"target": "code",
+					"projectRoot": "C:/Working/Development/EODMS/eodms-stac-api/lambda/_eodms-staging-stac_wksp/eodms-staging-stac",
+					"lambdaHandler": "lambda_function.lambda_handler"
+				},
+				"lambda": {
+					"runtime": "python3.9",
+					"payload": {},
+					"environmentVariables": {}
+				}
+			},
+			{
+				"type": "aws-sam",
+				"request": "direct-invoke",
+				"name": "eodms-staging-stac:lambda_function.lambda_handler (python3.9)",
+				"invokeTarget": {
+					"target": "code",
+					"projectRoot": "eodms-staging-stac",
+					"lambdaHandler": "lambda_function.lambda_handler"
+				},
+				"lambda": {
+					"runtime": "python3.9",
+					"payload": {},
+					"environmentVariables": {}
+				}
+			},
+			{
+				"type": "aws-sam",
+				"request": "direct-invoke",
+				"name": "eodms-prod-stac-access:lambda_function.lambda_handler (python3.9)",
+				"invokeTarget": {
+					"target": "code",
+					"projectRoot": "eodms-prod-stac-access",
+					"lambdaHandler": "lambda_function.lambda_handler"
+				},
+				"lambda": {
+					"runtime": "python3.9",
+					"payload": {},
+					"environmentVariables": {}
+				}
+			}
+		]
+	}
+}

eodms_cli.py

@@ -17,7 +17,7 @@
 __license__ = 'MIT License'
 __description__ = 'Script used to search, order and download imagery from ' \
                   'the EODMS using the REST API (RAPI) service.'
-__version__ = '3.4.0'
+__version__ = '3.4.2'
 __maintainer__ = 'Kevin Ballantyne'
 __email__ = 'eodms-sgdot@nrcan-rncan.gc.ca'
 

scripts/field.py

@@ -99,7 +99,10 @@ def get_choices(self, values_only=False):
         :return: A list of choices.
         :rtype:  list or None
         """
-        if values_only:
+
+        # print(f"self.choices: {self.choices}")
+
+        if values_only and self.choices:
             return [c.get('value') for c in self.choices]
 
         return self.choices