eamonford commented on a change in pull request #104: URL: https://github.com/apache/incubator-sdap-nexus/pull/104#discussion_r446363886
########## File path: analysis/webservice/algorithms_spark/ClimMapSpark.py ########## @@ -22,22 +22,17 @@ import numpy as np from nexustiles.nexustiles import NexusTileService -from webservice.NexusHandler import nexus_handler, SparkHandler, DEFAULT_PARAMETERS_SPEC +from webservice.NexusHandler import nexus_handler, DEFAULT_PARAMETERS_SPEC +from webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSkarkHandler from webservice.webmodel import NexusResults, NexusProcessingException, NoDataException @nexus_handler -class ClimMapSparkHandlerImpl(SparkHandler): +class ClimMapNexusSkarkHandlerImpl(NexusCalcSkarkHandler): Review comment: typo, lol ########## File path: analysis/webservice/algorithms_spark/HofMoellerSpark.py ########## @@ -100,7 +101,7 @@ def hofmoeller_stats(metrics_callback, tile_in_spark): return stats -class BaseHoffMoellerHandlerImpl(SparkHandler): +class BaseHoffMoellerSkarkHandlerImpl(NexusCalcSkarkHandler): Review comment: Skark ########## File path: analysis/webservice/algorithms_spark/DailyDifferenceAverageSpark.py ########## @@ -37,7 +38,7 @@ def iso_time_to_epoch(str_time): @nexus_handler -class DailyDifferenceAverageSparkImpl(SparkHandler): +class DailyDifferenceAverageNexusImplSkark(NexusCalcSkarkHandler): Review comment: typo: Skark ########## File path: analysis/webservice/algorithms_spark/NexusCalcSparkHandler.py ########## @@ -0,0 +1,359 @@ +import logging + +import numpy as np +from netCDF4._netCDF4 import Dataset +from webservice.algorithms.NexusCalcHandler import NexusCalcHandler +from webservice.metrics import MetricsRecord, SparkAccumulatorMetricsField, NumberMetricsField +from webservice.webmodel import NexusProcessingException + + +class NexusCalcSkarkHandler(NexusCalcHandler): Review comment: Skark ########## File path: analysis/webservice/algorithms_spark/TimeAvgMapSpark.py ########## @@ -21,15 +21,18 @@ import shapely.geometry from nexustiles.nexustiles import NexusTileService from pytz import timezone -from webservice.NexusHandler import nexus_handler, SparkHandler +from webservice.NexusHandler import nexus_handler +from webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSkarkHandler from webservice.webmodel import NexusResults, NexusProcessingException, NoDataException EPOCH = timezone('UTC').localize(datetime(1970, 1, 1)) ISO_8601 = '%Y-%m-%dT%H:%M:%S%z' @nexus_handler -class TimeAvgMapSparkHandlerImpl(SparkHandler): +class TimeAvgMapNexusSkarkHandlerImpl(NexusCalcSkarkHandler): Review comment: Skark ########## File path: analysis/webservice/webmodel/NexusRequestObjectTornadoFree.py ########## @@ -0,0 +1,108 @@ +import logging +import re +from datetime import datetime +from decimal import Decimal + +from pytz import UTC +from webservice.webmodel.RequestParameters import RequestParameters +from webservice.webmodel.StatsComputeOptions import StatsComputeOptions + + +class NexusRequestObjectTornadoFree(StatsComputeOptions): Review comment: Will this be renamed once NexusRequestObject is phased out? ########## File path: analysis/webservice/algorithms_spark/TimeSeriesSpark.py ########## @@ -42,7 +43,7 @@ @nexus_handler -class TimeSeriesHandlerImpl(SparkHandler): +class TimeSeriesSkarkHandlerImpl(NexusCalcSkarkHandler): Review comment: Skark ########## File path: analysis/webservice/algorithms_spark/VarianceSpark.py ########## @@ -23,15 +23,16 @@ from nexustiles.nexustiles import NexusTileService from pytz import timezone -from webservice.NexusHandler import nexus_handler, SparkHandler +from webservice.NexusHandler import nexus_handler +from webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSkarkHandler from webservice.webmodel import NexusResults, NexusProcessingException, NoDataException EPOCH = timezone('UTC').localize(datetime(1970, 1, 1)) ISO_8601 = '%Y-%m-%dT%H:%M:%S%z' @nexus_handler -class VarianceSparkHandlerImpl(SparkHandler): +class VarianceNexusSkarkHandlerImpl(NexusCalcSkarkHandler): Review comment: Skark ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org