This is an automated email from the ASF dual-hosted git repository.
nchung pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-sdap-in-situ-data-services.git
The following commit(s) were added to refs/heads/master by this push:
new 691e941 fix: SDAP-394 - added meta as default column in in-situ
endpoint response (#6)
691e941 is described below
commit 691e9411eabcf371b0208796886f0aabd874f6d2
Author: wphyojpl <[email protected]>
AuthorDate: Tue Jul 5 09:59:46 2022 -0700
fix: SDAP-394 - added meta as default column in in-situ endpoint response
(#6)
* feat: add CLI script
* chore: update readme
* chore: add changelog
* fix: added `meta` column as defaul column
* fix: add default column in correct place
* chore: update changelog + swagger
* chore: switch to SDAP ticket
---
CHANGELOG.md | 1 +
parquet_flask/io_logic/cdms_constants.py | 1 +
parquet_flask/io_logic/parquet_query_condition_management_v3.py | 2 +-
parquet_flask/io_logic/query_v4.py | 3 ---
parquet_flask/v1/insitu_query_swagger/insitu-spec-0.0.1.yml | 3 ++-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e44938a..796d47c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic
Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Added
- CDMS-xxx: Added `CLI` script to ingest S3 data into the Parquet system
+- SDAP-394: added meta as default column in in-situ endpoint response
### Changed
### Deprecated
### Removed
diff --git a/parquet_flask/io_logic/cdms_constants.py
b/parquet_flask/io_logic/cdms_constants.py
index 287f3f9..3040ba9 100644
--- a/parquet_flask/io_logic/cdms_constants.py
+++ b/parquet_flask/io_logic/cdms_constants.py
@@ -14,6 +14,7 @@
# limitations under the License.
class CDMSConstants:
+ meta_col = 'meta'
time_col = 'time'
provider_col = 'provider'
project_col = 'project'
diff --git a/parquet_flask/io_logic/parquet_query_condition_management_v3.py
b/parquet_flask/io_logic/parquet_query_condition_management_v3.py
index b5328ea..a2db3f1 100644
--- a/parquet_flask/io_logic/parquet_query_condition_management_v3.py
+++ b/parquet_flask/io_logic/parquet_query_condition_management_v3.py
@@ -12,7 +12,7 @@ class ParquetQueryConditionManagementV3:
def __init__(self, parquet_name, missing_depth_value, props=QueryProps()):
self.__conditions = []
self.__parquet_name = parquet_name if not parquet_name.endswith('/')
else parquet_name[:-1]
- self.__columns = [CDMSConstants.time_col, CDMSConstants.depth_col,
CDMSConstants.lat_col, CDMSConstants.lon_col]
+ self.__columns = [CDMSConstants.time_col, CDMSConstants.depth_col,
CDMSConstants.lat_col, CDMSConstants.lon_col, CDMSConstants.platform_col,
CDMSConstants.provider_col, CDMSConstants.project_col, CDMSConstants.meta_col]
self.__is_extending_base = True
self.__query_props = props
self.__missing_depth_value = missing_depth_value
diff --git a/parquet_flask/io_logic/query_v4.py
b/parquet_flask/io_logic/query_v4.py
index c4aa8ee..ec2a3d1 100644
--- a/parquet_flask/io_logic/query_v4.py
+++ b/parquet_flask/io_logic/query_v4.py
@@ -43,9 +43,6 @@ class QueryV4:
self.__missing_depth_value = CDMSConstants.missing_depth_value
self.__conditions = []
self.__sorting_columns = [CDMSConstants.time_col,
CDMSConstants.platform_code_col, CDMSConstants.depth_col,
CDMSConstants.lat_col, CDMSConstants.lon_col]
- self.__min_year = None
- self.__max_year = None
- self.__default_columns = [CDMSConstants.time_col,
CDMSConstants.depth_col, CDMSConstants.lat_col, CDMSConstants.lon_col,
CDMSConstants.platform_code_col, CDMSConstants.provider_col,
CDMSConstants.project_col] # , CDMSConstants.provider_col,
CDMSConstants.project_col, CDMSConstants.platform_col]
self.__set_missing_depth_val()
def __set_missing_depth_val(self):
diff --git a/parquet_flask/v1/insitu_query_swagger/insitu-spec-0.0.1.yml
b/parquet_flask/v1/insitu_query_swagger/insitu-spec-0.0.1.yml
index 9f1dbf2..7c1cca1 100644
--- a/parquet_flask/v1/insitu_query_swagger/insitu-spec-0.0.1.yml
+++ b/parquet_flask/v1/insitu_query_swagger/insitu-spec-0.0.1.yml
@@ -11,6 +11,7 @@ servers:
# - url: http://rda-data.ucar.edu:8890/ws/search
# - url: http://doms.coaps.fsu.edu/ws/search
- url: https://doms.jpl.nasa.gov/insitu/1.0
+ - url: https://cdms.ucar.edu/insitu/1.0
# - url:
https://a106a87ec5ba747c5915cc0ec23c149f-881305611.us-west-2.elb.amazonaws.com/insitu/1.0
# - url: /1.0
description: 'proxied doms.jpl.nasa.gov insitu'
@@ -303,7 +304,7 @@ components:
columnsParam:
in: query
name: columns
- description: 'one or more column names to list only those columns in the
result. Lat, Long, Time, and Depth are selected by default'
+ description: 'one or more column names to list only those columns in the
result. Project, Platform, Provider, meta, Lat, Long, Time, and Depth are
selected by default'
schema:
type: string
example: air_temperature
