This is an automated email from the ASF dual-hosted git repository. rkk pushed a commit to branch SDAP-507 in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
commit e02fc78f64b76e0974cd9bbc6f09b01cd9593447 Author: rileykk <[email protected]> AuthorDate: Thu Jan 11 10:49:19 2024 -0800 SDAP-507 - Changes to remove geos sub-dependency --- analysis/webservice/algorithms/doms/BaseDomsHandler.py | 7 ------- analysis/webservice/algorithms/doms/ResultsPlotQuery.py | 2 +- analysis/webservice/algorithms/doms/__init__.py | 2 +- .../webservice/nexus_tornado/app_builders/HandlerArgsBuilder.py | 7 ++++--- docker/nexus-webapp/Dockerfile | 4 ++-- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/analysis/webservice/algorithms/doms/BaseDomsHandler.py b/analysis/webservice/algorithms/doms/BaseDomsHandler.py index 84c9163..faa384f 100644 --- a/analysis/webservice/algorithms/doms/BaseDomsHandler.py +++ b/analysis/webservice/algorithms/doms/BaseDomsHandler.py @@ -35,13 +35,6 @@ from webservice.webmodel import NexusResults EPOCH = timezone('UTC').localize(datetime(1970, 1, 1)) ISO_8601 = '%Y-%m-%dT%H:%M:%S%z' -try: - from osgeo import gdal - from osgeo.gdalnumeric import * -except ImportError: - import gdal - from gdalnumeric import * - from netCDF4 import Dataset import netCDF4 import tempfile diff --git a/analysis/webservice/algorithms/doms/ResultsPlotQuery.py b/analysis/webservice/algorithms/doms/ResultsPlotQuery.py index 950c796..864cdc3 100644 --- a/analysis/webservice/algorithms/doms/ResultsPlotQuery.py +++ b/analysis/webservice/algorithms/doms/ResultsPlotQuery.py @@ -26,7 +26,7 @@ class PlotTypes: HISTOGRAM = "histogram" -@nexus_handler +# @nexus_handler class DomsResultsPlotHandler(BaseDomsHandler.BaseDomsQueryCalcHandler): name = "DOMS Results Plotting" path = "/domsplot" diff --git a/analysis/webservice/algorithms/doms/__init__.py b/analysis/webservice/algorithms/doms/__init__.py index bc568f8..8a94798 100644 --- a/analysis/webservice/algorithms/doms/__init__.py +++ b/analysis/webservice/algorithms/doms/__init__.py @@ -21,7 +21,7 @@ from . import DatasetListQuery from . import DomsInitialization from . import MatchupQuery from . import MetadataQuery -from . import ResultsPlotQuery +# from . import ResultsPlotQuery from . import ResultsRetrieval from . import ResultsStorage from . import StatsQuery diff --git a/analysis/webservice/nexus_tornado/app_builders/HandlerArgsBuilder.py b/analysis/webservice/nexus_tornado/app_builders/HandlerArgsBuilder.py index 2a84ae7..3b8b480 100644 --- a/analysis/webservice/nexus_tornado/app_builders/HandlerArgsBuilder.py +++ b/analysis/webservice/nexus_tornado/app_builders/HandlerArgsBuilder.py @@ -37,9 +37,10 @@ class HandlerArgsBuilder: class_wrapper == webservice.algorithms_spark.Matchup.Matchup or class_wrapper == webservice.algorithms_spark.MatchupDoms.MatchupDoms or issubclass(class_wrapper, webservice.algorithms.doms.BaseDomsHandler.BaseDomsQueryCalcHandler) - or issubclass(class_wrapper, webservice.algorithms_spark.NexusCalcSparkTornadoHandler.NexusCalcSparkTornadoHandler) + or issubclass(class_wrapper, + webservice.algorithms_spark.NexusCalcSparkTornadoHandler.NexusCalcSparkTornadoHandler) or class_wrapper == webservice.algorithms.doms.ResultsRetrieval.DomsResultsRetrievalHandler - or class_wrapper == webservice.algorithms.doms.ResultsPlotQuery.DomsResultsPlotHandler + # or class_wrapper == webservice.algorithms.doms.ResultsPlotQuery.DomsResultsPlotHandler ) @staticmethod @@ -50,7 +51,7 @@ class HandlerArgsBuilder: args = dict( clazz=clazz_wrapper, tile_service_factory=self.tile_service_factory, - thread_pool=self. request_thread_pool + thread_pool=self.request_thread_pool ) if issubclass(clazz_wrapper, webservice.algorithms_spark.NexusCalcSparkHandler.NexusCalcSparkHandler): diff --git a/docker/nexus-webapp/Dockerfile b/docker/nexus-webapp/Dockerfile index 515d6ab..6f13f9f 100644 --- a/docker/nexus-webapp/Dockerfile +++ b/docker/nexus-webapp/Dockerfile @@ -95,10 +95,10 @@ RUN python3 setup.py install clean WORKDIR /incubator-sdap-nexus/analysis RUN python3 setup.py install clean && mamba clean -afy +RUN pip install shapely==1.7.1 WORKDIR /incubator-sdap-nexus/tools/deletebyquery -RUN pip3 install cassandra-driver==3.20.1 -RUN pip3 install pyspark py4j +RUN pip3 install cassandra-driver==3.20.1 pyspark py4j RUN pip3 install -r requirements.txt RUN pip3 install cython RUN rm requirements.txt
