This is an automated email from the ASF dual-hosted git repository. rkk pushed a commit to branch tmp-stv in repository https://gitbox.apache.org/repos/asf/sdap-nexus.git
commit 6d5b2e3c4b7a2bd6c02bda160e20444e74d35353 Merge: c3fceeb 53340b6 Author: rileykk <[email protected]> AuthorDate: Mon Mar 18 16:11:13 2024 -0700 Merge branch 'SDAP-469-3d-data' into SDAP-492-tomograms # Conflicts: # analysis/conda-requirements.txt .asf.yaml | 14 + .gitignore | 3 +- .readthedocs.yaml | 5 + CHANGELOG.md | 34 +- README | 2 +- VERSION.txt | 2 +- analysis/conda-requirements.txt | 4 +- analysis/setup.py | 7 +- .../algorithms/DailyDifferenceAverage.py | 3 +- .../algorithms/StandardDeviationSearch.py | 2 +- .../webservice/algorithms/doms/BaseDomsHandler.py | 9 +- .../webservice/algorithms/doms/DatasetListQuery.py | 2 +- .../algorithms/doms/DomsInitialization.py | 5 +- .../webservice/algorithms/doms/ExecutionStatus.py | 19 +- .../webservice/algorithms/doms/ResultsPlotQuery.py | 56 -- .../webservice/algorithms/doms/ResultsStorage.py | 29 +- analysis/webservice/algorithms/doms/StacCatalog.py | 166 ++++++ analysis/webservice/algorithms/doms/__init__.py | 2 +- analysis/webservice/algorithms/doms/config.py | 22 +- .../algorithms/doms/domsconfig.ini.default | 2 +- analysis/webservice/algorithms/doms/insitu.py | 3 + analysis/webservice/algorithms/doms/mapplot.py | 174 ------- .../DailyDifferenceAverageSpark.py | 6 +- .../webservice/algorithms_spark/HofMoellerSpark.py | 8 +- analysis/webservice/algorithms_spark/Matchup.py | 53 +- .../algorithms_spark/NexusCalcSparkHandler.py | 3 + .../webservice/algorithms_spark/TimeSeriesSpark.py | 6 +- analysis/webservice/apidocs/openapi.yml | 86 +++- analysis/webservice/config/web.ini | 2 +- analysis/webservice/management/Datasets.py | 242 +++++++++ .../webservice/management}/__init__.py | 2 + .../app_builders/HandlerArgsBuilder.py | 6 +- .../nexus_tornado/app_builders/NexusAppBuilder.py | 2 +- .../request/handlers/NexusRequestHandler.py | 29 ++ .../webservice/webmodel/NexusExecutionResults.py | 62 ++- analysis/webservice/webmodel/NexusRequestObject.py | 6 + data-access/nexustiles/AbstractTileService.py | 202 ++++++++ .../nexustiles/{dao => backends}/__init__.py | 1 + .../{dao => backends/nexusproto}/__init__.py | 1 + .../nexusproto/backend.py} | 145 +----- .../nexusproto}/config/datastores.ini.default | 2 +- .../nexusproto}/dao/CassandraProxy.py | 0 .../{ => backends/nexusproto}/dao/DynamoProxy.py | 0 .../nexusproto}/dao/ElasticsearchProxy.py | 0 .../{ => backends/nexusproto}/dao/S3Proxy.py | 0 .../{ => backends/nexusproto}/dao/SolrProxy.py | 31 +- .../{ => backends/nexusproto}/dao/__init__.py | 0 .../nexustiles/{dao => backends/zarr}/__init__.py | 1 + data-access/nexustiles/backends/zarr/backend.py | 532 +++++++++++++++++++ .../__init__.py => config/datasets.ini.default} | 4 + .../nexustiles/{dao/__init__.py => exception.py} | 4 + data-access/nexustiles/nexustiles.py | 563 ++++++++++++++------- data-access/requirements.txt | 9 +- data-access/setup.py | 18 +- docker/nexus-webapp/Dockerfile | 6 +- docker/solr/cloud-init/Dockerfile | 4 +- docs/build.rst | 4 +- docs/quickstart.rst | 10 +- helm/requirements.yaml | 2 +- helm/values.yaml | 3 +- integrations/python-client/README.md | 0 integrations/python-client/requirements.txt | 13 - tools/deletebyquery/deletebyquery.py | 2 +- tools/doms-data-tools/update_doms_data_pk.py | 2 +- tools/domspurge/README.md | 2 +- tools/domspurge/purge.py | 2 +- 66 files changed, 1929 insertions(+), 712 deletions(-) diff --cc analysis/conda-requirements.txt index 7bfe957,22dff06..fe22ae4 --- a/analysis/conda-requirements.txt +++ b/analysis/conda-requirements.txt @@@ -33,5 -34,4 +34,6 @@@ gdal==3.2. mock==4.0.3 importlib_metadata==4.11.4 #singledispatch==3.4.0.3 + schema +matplotlib +xarray
