From 4276011cf6fc59c59bac8a46561092d4ff2c5a1f Mon Sep 17 00:00:00 2001 From: wphyojpl <38299756+wphyojpl@users.noreply.github.com> Date: Tue, 21 Jun 2022 14:00:45 -0700 Subject: [PATCH 1/8] Add insitu ingress --- helm/templates/ingress.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/helm/templates/ingress.yml b/helm/templates/ingress.yml index 8360b375..e4bd9e63 100644 --- a/helm/templates/ingress.yml +++ b/helm/templates/ingress.yml @@ -30,6 +30,13 @@ spec: name: nexus-webapp port: number: 8083 + - backend: + service: + name: parquet-t1-parquet-spark-helm + port: + number: 9801 + path: /(insitu.*) + pathType: ImplementationSpecific {{ if ne .Values.onEarthProxyIP "" }} - path: /onearth/?(.*) pathType: ImplementationSpecific From 2e3e9636d7a0eac1a3b3d37585eb594f8dc66eb8 Mon Sep 17 00:00:00 2001 From: wphyojpl <38299756+wphyojpl@users.noreply.github.com> Date: Tue, 21 Jun 2022 14:07:21 -0700 Subject: [PATCH 2/8] add condition to include insitu ingress --- helm/templates/ingress.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/helm/templates/ingress.yml b/helm/templates/ingress.yml index e4bd9e63..566aaadf 100644 --- a/helm/templates/ingress.yml +++ b/helm/templates/ingress.yml @@ -30,6 +30,7 @@ spec: name: nexus-webapp port: number: 8083 + {{ if .Values.insituAPI.enabled }} - backend: service: name: parquet-t1-parquet-spark-helm @@ -37,6 +38,7 @@ spec: number: 9801 path: /(insitu.*) pathType: ImplementationSpecific + {{ end }} {{ if ne .Values.onEarthProxyIP "" }} - path: /onearth/?(.*) pathType: ImplementationSpecific From abcdf1441b307f864a6615790e37178879df48fd Mon Sep 17 00:00:00 2001 From: wphyojpl <38299756+wphyojpl@users.noreply.github.com> Date: Tue, 21 Jun 2022 14:08:07 -0700 Subject: [PATCH 3/8] add default value for insituAPI.enabled for ingress --- helm/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/helm/values.yaml b/helm/values.yaml index afb43b4c..53c3d775 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -1,5 +1,8 @@ onEarthProxyIP: "" +insituAPI: + enabled: true + rootWebpage: enabled: true From baf4bf2a4785989023e79b1e5699f8f9d1e10a47 Mon Sep 17 00:00:00 2001 From: wphyojpl <38299756+wphyojpl@users.noreply.github.com> Date: Tue, 21 Jun 2022 14:09:57 -0700 Subject: [PATCH 4/8] chore: update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01530189..0b07e210 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,9 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - SDAP-372: Updated matchup algorithm to point to AWS insitu API endpoint - SDAP-372: Added new matchup endpoint `match_spark_doms` that points to DOMS insitu endpoint - SDAP-372: Updated `match_spark_doms` to interface with samos_cdms endpoint +- SDAP-xxx: Included `insitu` in ingress based on the value of `insituAPI.enabled` in `values.yaml` ### Changed ### Deprecated ### Removed ### Fixed - Fix failing test_matchup unit test -### Security \ No newline at end of file +### Security From 2c3d2149927d54d6cda14081b62fa089c3521070 Mon Sep 17 00:00:00 2001 From: wphyojpl <38299756+wphyojpl@users.noreply.github.com> Date: Tue, 21 Jun 2022 14:14:41 -0700 Subject: [PATCH 5/8] chore: add SDAP issue number --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b07e210..e70258ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - SDAP-372: Updated matchup algorithm to point to AWS insitu API endpoint - SDAP-372: Added new matchup endpoint `match_spark_doms` that points to DOMS insitu endpoint - SDAP-372: Updated `match_spark_doms` to interface with samos_cdms endpoint -- SDAP-xxx: Included `insitu` in ingress based on the value of `insituAPI.enabled` in `values.yaml` +- SDAP-393: Included `insitu` in ingress based on the value of `insituAPI.enabled` in `values.yaml` ### Changed ### Deprecated ### Removed From b07f69e97c9c850290cd3a35150bd4c3bdebfecd Mon Sep 17 00:00:00 2001 From: Wai Phyo Date: Fri, 28 Oct 2022 15:29:27 -0700 Subject: [PATCH 6/8] fix: enable tile_search endpoint --- analysis/webservice/algorithms/TileSearch.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/analysis/webservice/algorithms/TileSearch.py b/analysis/webservice/algorithms/TileSearch.py index 321d94fe..8c1ad332 100644 --- a/analysis/webservice/algorithms/TileSearch.py +++ b/analysis/webservice/algorithms/TileSearch.py @@ -14,11 +14,12 @@ # limitations under the License. +from webservice.NexusHandler import nexus_handler from webservice.algorithms.NexusCalcHandler import NexusCalcHandler from webservice.webmodel import NexusResults -# @nexus_handler +@nexus_handler class ChunkSearchCalcHandlerImpl(NexusCalcHandler): name = "Data Tile Search" path = "/tiles" From 02365298110b406a9585e4fce3729c3ab5cac162 Mon Sep 17 00:00:00 2001 From: Wai Phyo Date: Fri, 28 Oct 2022 15:29:56 -0700 Subject: [PATCH 7/8] fix: Object of type is not JSON serializable --- data-access/nexustiles/model/nexusmodel.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/data-access/nexustiles/model/nexusmodel.py b/data-access/nexustiles/model/nexusmodel.py index f5c9df64..82ea9f82 100644 --- a/data-access/nexustiles/model/nexusmodel.py +++ b/data-access/nexustiles/model/nexusmodel.py @@ -38,6 +38,15 @@ class TileVariable: variable_name: str = None standard_name: str = None + def __str__(self) -> str: + return str({ + 'variable_name': self.variable_name, + 'standard_name': self.standard_name, + }) + + def __repr__(self) -> str: + return self.__str__() + @dataclass class Tile(object): From 53d8de64810d7401ddcbce4b7ae058befcfb4610 Mon Sep 17 00:00:00 2001 From: Wai Phyo Date: Fri, 28 Oct 2022 15:39:51 -0700 Subject: [PATCH 8/8] chore: update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29f47579..f95d9d13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bumped ingress timeout in Helm chart to reflect AWS gateway timeout - SDAP-399: Updated quickstart guide for standalone docker deployment of SDAP. - SDAP-399: Updated quickstart Jupyter notebook +- fix: enable tile_search endpoint + fix: Object of type is not JSON serializable ### Deprecated ### Removed - removed dropdown from matchup doms endpoint secondary param