This is an automated email from the ASF dual-hosted git repository. rkk pushed a commit to branch SDAP-511 in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
commit 2a4e4b114162246df9e333542d02631e66a4edd9 Author: rileykk <[email protected]> AuthorDate: Wed Feb 28 15:36:43 2024 -0800 Edit import statements --- .../tests/algorithms/StandardDeviationSearch_test.py | 4 ++-- analysis/tests/algorithms/longitudelatitudemap_test.py | 6 +++--- analysis/tests/algorithms/test_base_doms_handler.py | 2 +- analysis/tests/algorithms/test_subsetter.py | 2 +- analysis/tests/algorithms_spark/test_matchup.py | 4 ++-- .../tests/algorithms_spark/test_timeseriesspark.py | 4 ++-- .../tests/integration/algorithms_spark/test_matchup.py | 2 +- analysis/tests/redirect/test_RemoteSDAPCache.py | 6 +++--- analysis/tests/webapp_test.py | 2 +- analysis/webservice/algorithms/Capabilities.py | 6 +++--- analysis/webservice/algorithms/ColorBarHandler.py | 4 ++-- analysis/webservice/algorithms/CorrelationMap.py | 6 +++--- .../webservice/algorithms/DailyDifferenceAverage.py | 6 +++--- analysis/webservice/algorithms/DataInBoundsSearch.py | 6 +++--- analysis/webservice/algorithms/DataSeriesList.py | 10 +++++----- analysis/webservice/algorithms/DelayTest.py | 4 ++-- analysis/webservice/algorithms/ErrorTosserTest.py | 4 ++-- analysis/webservice/algorithms/Heartbeat.py | 4 ++-- analysis/webservice/algorithms/HofMoeller.py | 6 +++--- analysis/webservice/algorithms/LongitudeLatitudeMap.py | 6 +++--- analysis/webservice/algorithms/MapFetchHandler.py | 6 +++--- .../webservice/algorithms/StandardDeviationSearch.py | 6 +++--- analysis/webservice/algorithms/TestInitializer.py | 2 +- analysis/webservice/algorithms/TileSearch.py | 4 ++-- analysis/webservice/algorithms/TimeAvgMap.py | 6 +++--- analysis/webservice/algorithms/TimeSeries.py | 8 ++++---- analysis/webservice/algorithms/TimeSeriesSolr.py | 8 ++++---- analysis/webservice/algorithms/doms/BaseDomsHandler.py | 4 ++-- .../webservice/algorithms/doms/DatasetListQuery.py | 6 +++--- .../webservice/algorithms/doms/DomsInitialization.py | 2 +- analysis/webservice/algorithms/doms/ExecutionCancel.py | 14 +++++++------- analysis/webservice/algorithms/doms/ExecutionStatus.py | 8 ++++---- analysis/webservice/algorithms/doms/MatchupQuery.py | 2 +- analysis/webservice/algorithms/doms/MetadataQuery.py | 6 +++--- .../webservice/algorithms/doms/ResultsRetrieval.py | 4 ++-- analysis/webservice/algorithms/doms/ResultsStorage.py | 4 ++-- analysis/webservice/algorithms/doms/StacCatalog.py | 8 ++++---- analysis/webservice/algorithms/doms/StatsQuery.py | 4 ++-- analysis/webservice/algorithms/doms/ValuesQuery.py | 4 ++-- analysis/webservice/algorithms/doms/fetchedgeimpl.py | 2 +- analysis/webservice/algorithms/doms/insitu.py | 2 +- analysis/webservice/algorithms/doms/insitusubset.py | 6 +++--- analysis/webservice/algorithms/doms/subsetter.py | 6 +++--- analysis/webservice/algorithms_spark/ClimMapSpark.py | 6 +++--- analysis/webservice/algorithms_spark/CorrMapSpark.py | 6 +++--- .../algorithms_spark/DailyDifferenceAverageSpark.py | 6 +++--- .../webservice/algorithms_spark/HofMoellerSpark.py | 8 ++++---- analysis/webservice/algorithms_spark/Matchup.py | 18 +++++++++--------- analysis/webservice/algorithms_spark/MatchupDoms.py | 14 +++++++------- .../webservice/algorithms_spark/MaximaMinimaSpark.py | 6 +++--- .../algorithms_spark/NexusCalcSparkHandler.py | 6 +++--- .../algorithms_spark/NexusCalcSparkTornadoHandler.py | 2 +- .../webservice/algorithms_spark/TimeAvgMapSpark.py | 6 +++--- .../webservice/algorithms_spark/TimeSeriesSpark.py | 10 +++++----- analysis/webservice/algorithms_spark/VarianceSpark.py | 6 +++--- .../nexus_tornado/app_builders/HandlerArgsBuilder.py | 2 +- .../nexus_tornado/app_builders/NexusAppBuilder.py | 4 ++-- .../nexus_tornado/app_builders/RedirectAppBuilder.py | 4 ++-- .../request/handlers/NexusRequestHandler.py | 6 +++--- .../request/renderers/NexusCSVRenderer.py | 2 +- .../request/renderers/NexusNETCDFRenderer.py | 2 +- .../request/renderers/NexusPNGRenderer.py | 2 +- .../request/renderers/NexusZIPRenderer.py | 2 +- analysis/webservice/redirect/RedirectHandler.py | 2 +- .../webservice/redirect/RemoteCollectionMatcher.py | 2 +- analysis/webservice/webapp.py | 7 ++++++- analysis/webservice/webapp_livy.py | 4 ++-- analysis/webservice/webmodel/Exceptions.py | 2 +- analysis/webservice/webmodel/NexusRequestObject.py | 4 ++-- .../webmodel/NexusRequestObjectTornadoFree.py | 4 ++-- analysis/webservice/webmodel/NexusResults.py | 2 +- tools/doms-data-tools/update_values_type.py | 2 +- 72 files changed, 184 insertions(+), 179 deletions(-) diff --git a/analysis/tests/algorithms/StandardDeviationSearch_test.py b/analysis/tests/algorithms/StandardDeviationSearch_test.py index 54929b0..49f9a6a 100644 --- a/analysis/tests/algorithms/StandardDeviationSearch_test.py +++ b/analysis/tests/algorithms/StandardDeviationSearch_test.py @@ -27,8 +27,8 @@ from nexustiles.nexustiles import NexusTileService from tornado.testing import AsyncHTTPTestCase, bind_unused_port import tornado.web -from webservice.algorithms import StandardDeviationSearch -from webservice.nexus_tornado.request.handlers.NexusRequestHandler import NexusRequestHandler +from analysis.webservice.algorithms import StandardDeviationSearch +from analysis.webservice.nexus_tornado.request.handlers.NexusRequestHandler import NexusRequestHandler class HttpParametersTest(AsyncHTTPTestCase): diff --git a/analysis/tests/algorithms/longitudelatitudemap_test.py b/analysis/tests/algorithms/longitudelatitudemap_test.py index a40e4d3..5d1fce0 100644 --- a/analysis/tests/algorithms/longitudelatitudemap_test.py +++ b/analysis/tests/algorithms/longitudelatitudemap_test.py @@ -24,10 +24,10 @@ from shapely.geometry import box from tornado.testing import bind_unused_port from tornado.web import Application #from webapp import ModularNexusHandlerWrapper -from webservice.webmodel import NexusRequestObject -from webservice.nexus_tornado.request.handlers import NexusRequestHandler +from analysis.webservice.webmodel import NexusRequestObject +from analysis.webservice.nexus_tornado.request.handlers import NexusRequestHandler -from webservice.algorithms import LongitudeLatitudeMap +from analysis.webservice.algorithms import LongitudeLatitudeMap class TestLongitudeLatitudeMap(unittest.TestCase): diff --git a/analysis/tests/algorithms/test_base_doms_handler.py b/analysis/tests/algorithms/test_base_doms_handler.py index a427edd..b001dd8 100644 --- a/analysis/tests/algorithms/test_base_doms_handler.py +++ b/analysis/tests/algorithms/test_base_doms_handler.py @@ -19,7 +19,7 @@ import csv import pytest from netCDF4 import Dataset import io -from webservice.algorithms.doms.BaseDomsHandler import DomsCSVFormatter, DomsNetCDFFormatter +from analysis.webservice.algorithms.doms.BaseDomsHandler import DomsCSVFormatter, DomsNetCDFFormatter @pytest.fixture() diff --git a/analysis/tests/algorithms/test_subsetter.py b/analysis/tests/algorithms/test_subsetter.py index bf1bcbf..696ccd3 100644 --- a/analysis/tests/algorithms/test_subsetter.py +++ b/analysis/tests/algorithms/test_subsetter.py @@ -19,7 +19,7 @@ from os import listdir from os.path import dirname, join, realpath, abspath, isfile import pytest -from webservice.algorithms.doms.subsetter import SubsetResult +from analysis.webservice.algorithms.doms.subsetter import SubsetResult def test_to_csv(input_data): diff --git a/analysis/tests/algorithms_spark/test_matchup.py b/analysis/tests/algorithms_spark/test_matchup.py index 47d00c3..bf6bfe3 100644 --- a/analysis/tests/algorithms_spark/test_matchup.py +++ b/analysis/tests/algorithms_spark/test_matchup.py @@ -22,12 +22,12 @@ from datetime import datetime, timezone import mock import numpy as np import pytest -import webservice.algorithms_spark.Matchup as matchup +import analysis.webservice.algorithms_spark.Matchup as matchup from nexustiles.model.nexusmodel import Tile, TileVariable from pyspark.sql import SparkSession from shapely import wkt from shapely.geometry import box -from webservice.algorithms_spark.Matchup import DomsPoint, Matchup, DataPoint, spark_matchup_driver +from analysis.webservice.algorithms_spark.Matchup import DomsPoint, Matchup, DataPoint, spark_matchup_driver class MockSparkParam: diff --git a/analysis/tests/algorithms_spark/test_timeseriesspark.py b/analysis/tests/algorithms_spark/test_timeseriesspark.py index fe6d1fe..c943d71 100644 --- a/analysis/tests/algorithms_spark/test_timeseriesspark.py +++ b/analysis/tests/algorithms_spark/test_timeseriesspark.py @@ -23,12 +23,12 @@ import itertools from random import uniform import pytest -import webservice.algorithms_spark.TimeSeriesSpark as timeseries +import analysis.webservice.algorithms_spark.TimeSeriesSpark as timeseries from nexustiles.model.nexusmodel import Tile from pyspark.sql import SparkSession from shapely import wkt from shapely.geometry import box -from webservice.algorithms_spark.TimeSeriesSpark import TimeSeriesSparkHandlerImpl +from analysis.webservice.algorithms_spark.TimeSeriesSpark import TimeSeriesSparkHandlerImpl class MockSparkParam: def __init__(self, value): diff --git a/analysis/tests/integration/algorithms_spark/test_matchup.py b/analysis/tests/integration/algorithms_spark/test_matchup.py index 61bd04b..c9a98df 100644 --- a/analysis/tests/integration/algorithms_spark/test_matchup.py +++ b/analysis/tests/integration/algorithms_spark/test_matchup.py @@ -17,7 +17,7 @@ import unittest import pytest from shapely import wkt -from webservice.algorithms_spark.Matchup import * +from analysis.webservice.algorithms_spark.Matchup import * @pytest.mark.integration diff --git a/analysis/tests/redirect/test_RemoteSDAPCache.py b/analysis/tests/redirect/test_RemoteSDAPCache.py index 69134de..2597288 100644 --- a/analysis/tests/redirect/test_RemoteSDAPCache.py +++ b/analysis/tests/redirect/test_RemoteSDAPCache.py @@ -19,9 +19,9 @@ import requests from datetime import datetime from datetime import timedelta -from webservice.redirect import RemoteSDAPCache -from webservice.redirect import CollectionNotFound -from webservice.redirect.RemoteSDAPCache import RemoteSDAPList +from analysis.webservice.redirect import RemoteSDAPCache +from analysis.webservice.redirect import CollectionNotFound +from analysis.webservice.redirect.RemoteSDAPCache import RemoteSDAPList class MockResponse: def __init__(self, json_data, status_code): diff --git a/analysis/tests/webapp_test.py b/analysis/tests/webapp_test.py index 4ad4692..0144238 100644 --- a/analysis/tests/webapp_test.py +++ b/analysis/tests/webapp_test.py @@ -21,7 +21,7 @@ import os import logging import mock -from webservice.webapp import inject_args_in_config +from analysis.webservice.webapp import inject_args_in_config logging.basicConfig( level=logging.DEBUG, diff --git a/analysis/webservice/algorithms/Capabilities.py b/analysis/webservice/algorithms/Capabilities.py index fa85a7c..32afa9c 100644 --- a/analysis/webservice/algorithms/Capabilities.py +++ b/analysis/webservice/algorithms/Capabilities.py @@ -16,9 +16,9 @@ import json -from webservice.NexusHandler import nexus_handler, AVAILABLE_HANDLERS -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler -from webservice.webmodel import NexusResults +from analysis.webservice.NexusHandler import nexus_handler, AVAILABLE_HANDLERS +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler +from analysis.webservice.webmodel import NexusResults @nexus_handler diff --git a/analysis/webservice/algorithms/ColorBarHandler.py b/analysis/webservice/algorithms/ColorBarHandler.py index 980c8e5..74014f6 100644 --- a/analysis/webservice/algorithms/ColorBarHandler.py +++ b/analysis/webservice/algorithms/ColorBarHandler.py @@ -20,8 +20,8 @@ import time import numpy as np from . import colortables -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler as BaseHandler -from webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler as BaseHandler +from analysis.webservice.NexusHandler import nexus_handler @nexus_handler diff --git a/analysis/webservice/algorithms/CorrelationMap.py b/analysis/webservice/algorithms/CorrelationMap.py index 8c18ae9..412dc16 100644 --- a/analysis/webservice/algorithms/CorrelationMap.py +++ b/analysis/webservice/algorithms/CorrelationMap.py @@ -23,9 +23,9 @@ from nexustiles.model.nexusmodel import get_approximate_value_for_lat_lon from scipy.stats import linregress from shapely.geometry import box -from webservice.NexusHandler import nexus_handler, DEFAULT_PARAMETERS_SPEC -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler -from webservice.webmodel import NexusProcessingException, NexusResults +from analysis.webservice.NexusHandler import nexus_handler, DEFAULT_PARAMETERS_SPEC +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler +from analysis.webservice.webmodel import NexusProcessingException, NexusResults @nexus_handler diff --git a/analysis/webservice/algorithms/DailyDifferenceAverage.py b/analysis/webservice/algorithms/DailyDifferenceAverage.py index 05274fc..48cd45f 100644 --- a/analysis/webservice/algorithms/DailyDifferenceAverage.py +++ b/analysis/webservice/algorithms/DailyDifferenceAverage.py @@ -24,9 +24,9 @@ import pytz from nexustiles.nexustiles import NexusTileService, NexusTileServiceException from shapely.geometry import box -from webservice.NexusHandler import nexus_handler -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler -from webservice.webmodel import NexusResults, NexusProcessingException +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler +from analysis.webservice.webmodel import NexusResults, NexusProcessingException SENTINEL = 'STOP' diff --git a/analysis/webservice/algorithms/DataInBoundsSearch.py b/analysis/webservice/algorithms/DataInBoundsSearch.py index 2df061f..ab4fb07 100644 --- a/analysis/webservice/algorithms/DataInBoundsSearch.py +++ b/analysis/webservice/algorithms/DataInBoundsSearch.py @@ -20,9 +20,9 @@ import numpy from datetime import datetime from pytz import timezone -from webservice.NexusHandler import nexus_handler -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler -from webservice.webmodel import NexusResults, NexusProcessingException +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler +from analysis.webservice.webmodel import NexusResults, NexusProcessingException EPOCH = timezone('UTC').localize(datetime(1970, 1, 1)) ISO_8601 = '%Y-%m-%dT%H:%M:%S%z' diff --git a/analysis/webservice/algorithms/DataSeriesList.py b/analysis/webservice/algorithms/DataSeriesList.py index e247bb6..a35d737 100644 --- a/analysis/webservice/algorithms/DataSeriesList.py +++ b/analysis/webservice/algorithms/DataSeriesList.py @@ -16,11 +16,11 @@ import json -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler -from webservice.redirect import RemoteSDAPCache -from webservice.redirect import CollectionNotFound -from webservice.NexusHandler import nexus_handler -from webservice.webmodel import cached +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler +from analysis.webservice.redirect import RemoteSDAPCache +from analysis.webservice.redirect import CollectionNotFound +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.webmodel import cached import logging diff --git a/analysis/webservice/algorithms/DelayTest.py b/analysis/webservice/algorithms/DelayTest.py index de56f56..001bce6 100644 --- a/analysis/webservice/algorithms/DelayTest.py +++ b/analysis/webservice/algorithms/DelayTest.py @@ -16,8 +16,8 @@ import time -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler -from webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler +from analysis.webservice.NexusHandler import nexus_handler @nexus_handler diff --git a/analysis/webservice/algorithms/ErrorTosserTest.py b/analysis/webservice/algorithms/ErrorTosserTest.py index 0100552..a5fc4fa 100644 --- a/analysis/webservice/algorithms/ErrorTosserTest.py +++ b/analysis/webservice/algorithms/ErrorTosserTest.py @@ -14,8 +14,8 @@ # limitations under the License. -from webservice.NexusHandler import nexus_handler -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler @nexus_handler diff --git a/analysis/webservice/algorithms/Heartbeat.py b/analysis/webservice/algorithms/Heartbeat.py index bc1f50f..fc0518c 100644 --- a/analysis/webservice/algorithms/Heartbeat.py +++ b/analysis/webservice/algorithms/Heartbeat.py @@ -16,8 +16,8 @@ import json -from webservice.NexusHandler import nexus_handler -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler @nexus_handler diff --git a/analysis/webservice/algorithms/HofMoeller.py b/analysis/webservice/algorithms/HofMoeller.py index 6bb805a..52ec2fa 100644 --- a/analysis/webservice/algorithms/HofMoeller.py +++ b/analysis/webservice/algorithms/HofMoeller.py @@ -28,9 +28,9 @@ import numpy as np from matplotlib import cm from matplotlib.ticker import FuncFormatter -from webservice.NexusHandler import nexus_handler, DEFAULT_PARAMETERS_SPEC -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler -from webservice.webmodel import NexusProcessingException, NexusResults +from analysis.webservice.NexusHandler import nexus_handler, DEFAULT_PARAMETERS_SPEC +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler +from analysis.webservice.webmodel import NexusProcessingException, NexusResults SENTINEL = 'STOP' LATITUDE = 0 diff --git a/analysis/webservice/algorithms/LongitudeLatitudeMap.py b/analysis/webservice/algorithms/LongitudeLatitudeMap.py index e477f14..08f9252 100644 --- a/analysis/webservice/algorithms/LongitudeLatitudeMap.py +++ b/analysis/webservice/algorithms/LongitudeLatitudeMap.py @@ -20,9 +20,9 @@ from datetime import datetime from pytz import timezone from shapely.geometry import box -from webservice.NexusHandler import nexus_handler -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler -from webservice.webmodel import NexusResults, NexusProcessingException +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler +from analysis.webservice.webmodel import NexusResults, NexusProcessingException SENTINEL = 'STOP' EPOCH = timezone('UTC').localize(datetime(1970, 1, 1)) diff --git a/analysis/webservice/algorithms/MapFetchHandler.py b/analysis/webservice/algorithms/MapFetchHandler.py index 234c5ed..e37b0f6 100644 --- a/analysis/webservice/algorithms/MapFetchHandler.py +++ b/analysis/webservice/algorithms/MapFetchHandler.py @@ -30,9 +30,9 @@ from PIL import ImageFont from dateutil.relativedelta import * from . import colortables -import webservice.GenerateImageMRF as MRF -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler as BaseHandler -from webservice.NexusHandler import nexus_handler +import analysis.webservice.GenerateImageMRF as MRF +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler as BaseHandler +from analysis.webservice.NexusHandler import nexus_handler @nexus_handler diff --git a/analysis/webservice/algorithms/StandardDeviationSearch.py b/analysis/webservice/algorithms/StandardDeviationSearch.py index ae0566f..326711c 100644 --- a/analysis/webservice/algorithms/StandardDeviationSearch.py +++ b/analysis/webservice/algorithms/StandardDeviationSearch.py @@ -22,9 +22,9 @@ from functools import partial from nexustiles.nexustiles import NexusTileServiceException from pytz import timezone -from webservice.NexusHandler import nexus_handler -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler -from webservice.webmodel import NexusProcessingException, CustomEncoder +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler +from analysis.webservice.webmodel import NexusProcessingException, CustomEncoder SENTINEL = 'STOP' EPOCH = timezone('UTC').localize(datetime(1970, 1, 1)) diff --git a/analysis/webservice/algorithms/TestInitializer.py b/analysis/webservice/algorithms/TestInitializer.py index c16a0bb..1a40bff 100644 --- a/analysis/webservice/algorithms/TestInitializer.py +++ b/analysis/webservice/algorithms/TestInitializer.py @@ -15,7 +15,7 @@ -from webservice.NexusHandler import nexus_initializer +from analysis.webservice.NexusHandler import nexus_initializer @nexus_initializer diff --git a/analysis/webservice/algorithms/TileSearch.py b/analysis/webservice/algorithms/TileSearch.py index 321d94f..c4ddbe3 100644 --- a/analysis/webservice/algorithms/TileSearch.py +++ b/analysis/webservice/algorithms/TileSearch.py @@ -14,8 +14,8 @@ # limitations under the License. -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler -from webservice.webmodel import NexusResults +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler +from analysis.webservice.webmodel import NexusResults # @nexus_handler diff --git a/analysis/webservice/algorithms/TimeAvgMap.py b/analysis/webservice/algorithms/TimeAvgMap.py index bbacd8b..308eaeb 100644 --- a/analysis/webservice/algorithms/TimeAvgMap.py +++ b/analysis/webservice/algorithms/TimeAvgMap.py @@ -20,9 +20,9 @@ import sys import numpy as np from time import time -from webservice.NexusHandler import DEFAULT_PARAMETERS_SPEC -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler -from webservice.webmodel import NexusResults, NoDataException +from analysis.webservice.NexusHandler import DEFAULT_PARAMETERS_SPEC +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler +from analysis.webservice.webmodel import NexusResults, NoDataException from netCDF4 import Dataset diff --git a/analysis/webservice/algorithms/TimeSeries.py b/analysis/webservice/algorithms/TimeSeries.py index f96a2f9..0113aa7 100644 --- a/analysis/webservice/algorithms/TimeSeries.py +++ b/analysis/webservice/algorithms/TimeSeries.py @@ -32,10 +32,10 @@ from nexustiles.nexustiles import NexusTileService from pytz import timezone from scipy import stats -from webservice import Filtering as filtering -from webservice.NexusHandler import nexus_handler -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler -from webservice.webmodel import NexusResults, NexusProcessingException, NoDataException +from analysis.webservice.import Filtering as filtering +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler +from analysis.webservice.webmodel import NexusResults, NexusProcessingException, NoDataException SENTINEL = 'STOP' EPOCH = timezone('UTC').localize(datetime(1970, 1, 1)) diff --git a/analysis/webservice/algorithms/TimeSeriesSolr.py b/analysis/webservice/algorithms/TimeSeriesSolr.py index 692ad70..9cda980 100644 --- a/analysis/webservice/algorithms/TimeSeriesSolr.py +++ b/analysis/webservice/algorithms/TimeSeriesSolr.py @@ -26,10 +26,10 @@ import numpy as np from nexustiles.nexustiles import NexusTileService from scipy import stats -from webservice import Filtering as filt -from webservice.NexusHandler import nexus_handler, DEFAULT_PARAMETERS_SPEC -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler -from webservice.webmodel import NexusResults, NexusProcessingException, NoDataException +from analysis.webservice.import Filtering as filt +from analysis.webservice.NexusHandler import nexus_handler, DEFAULT_PARAMETERS_SPEC +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler +from analysis.webservice.webmodel import NexusResults, NexusProcessingException, NoDataException SENTINEL = 'STOP' diff --git a/analysis/webservice/algorithms/doms/BaseDomsHandler.py b/analysis/webservice/algorithms/doms/BaseDomsHandler.py index f1ac092..11d6a1c 100644 --- a/analysis/webservice/algorithms/doms/BaseDomsHandler.py +++ b/analysis/webservice/algorithms/doms/BaseDomsHandler.py @@ -29,8 +29,8 @@ from pytz import timezone, UTC from . import config from . import geo -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler -from webservice.webmodel import NexusResults +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler +from analysis.webservice.webmodel import NexusResults EPOCH = timezone('UTC').localize(datetime(1970, 1, 1)) ISO_8601 = '%Y-%m-%dT%H:%M:%S%z' diff --git a/analysis/webservice/algorithms/doms/DatasetListQuery.py b/analysis/webservice/algorithms/doms/DatasetListQuery.py index 5427eb2..2504fe9 100644 --- a/analysis/webservice/algorithms/doms/DatasetListQuery.py +++ b/analysis/webservice/algorithms/doms/DatasetListQuery.py @@ -21,9 +21,9 @@ import requests from . import BaseDomsHandler from . import config from . import values -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler as BaseHandler -from webservice.NexusHandler import nexus_handler -from webservice.webmodel import cached, NexusResults +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler as BaseHandler +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.webmodel import cached, NexusResults @nexus_handler diff --git a/analysis/webservice/algorithms/doms/DomsInitialization.py b/analysis/webservice/algorithms/doms/DomsInitialization.py index a10a7e7..1e28bd1 100644 --- a/analysis/webservice/algorithms/doms/DomsInitialization.py +++ b/analysis/webservice/algorithms/doms/DomsInitialization.py @@ -24,7 +24,7 @@ from cassandra.cluster import Cluster from cassandra.cluster import NoHostAvailable from cassandra.policies import (DCAwareRoundRobinPolicy, TokenAwarePolicy, WhiteListRoundRobinPolicy) -from webservice.NexusHandler import nexus_initializer +from analysis.webservice.NexusHandler import nexus_initializer @nexus_initializer diff --git a/analysis/webservice/algorithms/doms/ExecutionCancel.py b/analysis/webservice/algorithms/doms/ExecutionCancel.py index 466428c..752a06e 100644 --- a/analysis/webservice/algorithms/doms/ExecutionCancel.py +++ b/analysis/webservice/algorithms/doms/ExecutionCancel.py @@ -15,14 +15,14 @@ import uuid -from webservice.NexusHandler import nexus_handler -from webservice.algorithms.doms.ResultsStorage import ResultsRetrieval -from webservice.webmodel import NexusExecutionResults -from webservice.algorithms_spark.NexusCalcSparkTornadoHandler import NexusCalcSparkTornadoHandler +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms.doms.ResultsStorage import ResultsRetrieval +from analysis.webservice.webmodel import NexusExecutionResults +from analysis.webservice.algorithms_spark.NexusCalcSparkTornadoHandler import NexusCalcSparkTornadoHandler from datetime import datetime -from webservice.algorithms.doms.ResultsStorage import ResultsStorage -from webservice.webmodel.NexusExecutionResults import ExecutionStatus -from webservice.webmodel import NexusProcessingException +from analysis.webservice.algorithms.doms.ResultsStorage import ResultsStorage +from analysis.webservice.webmodel.NexusExecutionResults import ExecutionStatus +from analysis.webservice.webmodel import NexusProcessingException @nexus_handler diff --git a/analysis/webservice/algorithms/doms/ExecutionStatus.py b/analysis/webservice/algorithms/doms/ExecutionStatus.py index 9817b07..10b1392 100644 --- a/analysis/webservice/algorithms/doms/ExecutionStatus.py +++ b/analysis/webservice/algorithms/doms/ExecutionStatus.py @@ -16,10 +16,10 @@ import uuid from . import BaseDomsHandler -from webservice.NexusHandler import nexus_handler -from webservice.algorithms.doms.ResultsStorage import ResultsRetrieval -from webservice.webmodel import NexusExecutionResults -from webservice.webmodel import NexusProcessingException +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms.doms.ResultsStorage import ResultsRetrieval +from analysis.webservice.webmodel import NexusExecutionResults +from analysis.webservice.webmodel import NexusProcessingException @nexus_handler diff --git a/analysis/webservice/algorithms/doms/MatchupQuery.py b/analysis/webservice/algorithms/doms/MatchupQuery.py index a49f4b9..749b367 100644 --- a/analysis/webservice/algorithms/doms/MatchupQuery.py +++ b/analysis/webservice/algorithms/doms/MatchupQuery.py @@ -28,7 +28,7 @@ from . import datafetch from . import fetchedgeimpl from . import geo from . import workerthread -from webservice.NexusHandler import nexus_handler +from analysis.webservice.NexusHandler import nexus_handler @nexus_handler diff --git a/analysis/webservice/algorithms/doms/MetadataQuery.py b/analysis/webservice/algorithms/doms/MetadataQuery.py index 8f71c1e..0cbabaa 100644 --- a/analysis/webservice/algorithms/doms/MetadataQuery.py +++ b/analysis/webservice/algorithms/doms/MetadataQuery.py @@ -19,9 +19,9 @@ import requests from . import BaseDomsHandler from . import config -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler as BaseHandler -from webservice.NexusHandler import nexus_handler -from webservice.webmodel import DatasetNotFoundException +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler as BaseHandler +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.webmodel import DatasetNotFoundException @nexus_handler diff --git a/analysis/webservice/algorithms/doms/ResultsRetrieval.py b/analysis/webservice/algorithms/doms/ResultsRetrieval.py index f03c1ca..9a3c0d4 100644 --- a/analysis/webservice/algorithms/doms/ResultsRetrieval.py +++ b/analysis/webservice/algorithms/doms/ResultsRetrieval.py @@ -17,8 +17,8 @@ import uuid from . import BaseDomsHandler from . import ResultsStorage -from webservice.NexusHandler import nexus_handler -from webservice.webmodel import NexusProcessingException +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.webmodel import NexusProcessingException @nexus_handler diff --git a/analysis/webservice/algorithms/doms/ResultsStorage.py b/analysis/webservice/algorithms/doms/ResultsStorage.py index 0cc5bd1..6b02ecf 100644 --- a/analysis/webservice/algorithms/doms/ResultsStorage.py +++ b/analysis/webservice/algorithms/doms/ResultsStorage.py @@ -26,8 +26,8 @@ from cassandra.cluster import Cluster from cassandra.concurrent import execute_concurrent_with_args from cassandra.policies import TokenAwarePolicy, DCAwareRoundRobinPolicy from pytz import UTC -from webservice.algorithms.doms.BaseDomsHandler import DomsEncoder -from webservice.webmodel import NexusProcessingException +from analysis.webservice.algorithms.doms.BaseDomsHandler import DomsEncoder +from analysis.webservice.webmodel import NexusProcessingException BATCH_SIZE = 1024 diff --git a/analysis/webservice/algorithms/doms/StacCatalog.py b/analysis/webservice/algorithms/doms/StacCatalog.py index 2c1aa12..b320af3 100644 --- a/analysis/webservice/algorithms/doms/StacCatalog.py +++ b/analysis/webservice/algorithms/doms/StacCatalog.py @@ -18,10 +18,10 @@ import re import uuid from typing import List -from webservice.NexusHandler import nexus_handler -from webservice.algorithms.doms.ResultsStorage import ResultsRetrieval -from webservice.webmodel import NexusProcessingException -from webservice.webmodel import NexusResults +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms.doms.ResultsStorage import ResultsRetrieval +from analysis.webservice.webmodel import NexusProcessingException +from analysis.webservice.webmodel import NexusResults from . import BaseDomsHandler diff --git a/analysis/webservice/algorithms/doms/StatsQuery.py b/analysis/webservice/algorithms/doms/StatsQuery.py index c4b3aed..59c90f7 100644 --- a/analysis/webservice/algorithms/doms/StatsQuery.py +++ b/analysis/webservice/algorithms/doms/StatsQuery.py @@ -15,8 +15,8 @@ from . import BaseDomsHandler from . import datafetch -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler as BaseHandler -from webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler as BaseHandler +from analysis.webservice.NexusHandler import nexus_handler @nexus_handler diff --git a/analysis/webservice/algorithms/doms/ValuesQuery.py b/analysis/webservice/algorithms/doms/ValuesQuery.py index be736b6..ffdfe22 100644 --- a/analysis/webservice/algorithms/doms/ValuesQuery.py +++ b/analysis/webservice/algorithms/doms/ValuesQuery.py @@ -19,8 +19,8 @@ from pytz import timezone from . import BaseDomsHandler from . import datafetch -from webservice.algorithms.NexusCalcHandler import NexusCalcHandler as BaseHandler -from webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler as BaseHandler +from analysis.webservice.NexusHandler import nexus_handler EPOCH = timezone('UTC').localize(datetime(1970, 1, 1)) diff --git a/analysis/webservice/algorithms/doms/fetchedgeimpl.py b/analysis/webservice/algorithms/doms/fetchedgeimpl.py index 7cbab75..071665d 100644 --- a/analysis/webservice/algorithms/doms/fetchedgeimpl.py +++ b/analysis/webservice/algorithms/doms/fetchedgeimpl.py @@ -22,7 +22,7 @@ import requests from . import geo from . import values -from webservice.webmodel import NexusProcessingException +from analysis.webservice.webmodel import NexusProcessingException def __parseDatetime(dtString): diff --git a/analysis/webservice/algorithms/doms/insitu.py b/analysis/webservice/algorithms/doms/insitu.py index ae35b4a..c729620 100644 --- a/analysis/webservice/algorithms/doms/insitu.py +++ b/analysis/webservice/algorithms/doms/insitu.py @@ -19,7 +19,7 @@ Module for querying CDMS In-Situ API import logging import requests from datetime import datetime -from webservice.algorithms.doms import config as insitu_endpoints +from analysis.webservice.algorithms.doms import config as insitu_endpoints def query_insitu_schema(): diff --git a/analysis/webservice/algorithms/doms/insitusubset.py b/analysis/webservice/algorithms/doms/insitusubset.py index cf4fd44..f2dcc30 100644 --- a/analysis/webservice/algorithms/doms/insitusubset.py +++ b/analysis/webservice/algorithms/doms/insitusubset.py @@ -22,9 +22,9 @@ from datetime import datetime import requests from . import BaseDomsHandler -from webservice.NexusHandler import nexus_handler -from webservice.algorithms.doms import config as edge_endpoints -from webservice.webmodel import NexusProcessingException, NoDataException +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms.doms import config as edge_endpoints +from analysis.webservice.webmodel import NexusProcessingException, NoDataException ISO_8601 = '%Y-%m-%dT%H:%M:%S%z' diff --git a/analysis/webservice/algorithms/doms/subsetter.py b/analysis/webservice/algorithms/doms/subsetter.py index bf63fc8..1880e49 100644 --- a/analysis/webservice/algorithms/doms/subsetter.py +++ b/analysis/webservice/algorithms/doms/subsetter.py @@ -20,9 +20,9 @@ import zipfile from datetime import datetime from pytz import timezone -from webservice.NexusHandler import nexus_handler -from webservice.algorithms.doms.insitu import query_insitu -from webservice.webmodel import NexusProcessingException, NexusResults +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms.doms.insitu import query_insitu +from analysis.webservice.webmodel import NexusProcessingException, NexusResults from . import BaseDomsHandler diff --git a/analysis/webservice/algorithms_spark/ClimMapSpark.py b/analysis/webservice/algorithms_spark/ClimMapSpark.py index 8b34324..d791c8a 100644 --- a/analysis/webservice/algorithms_spark/ClimMapSpark.py +++ b/analysis/webservice/algorithms_spark/ClimMapSpark.py @@ -22,9 +22,9 @@ from datetime import datetime import numpy as np from nexustiles.nexustiles import NexusTileService -from webservice.NexusHandler import nexus_handler, DEFAULT_PARAMETERS_SPEC -from webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler -from webservice.webmodel import NexusResults, NexusProcessingException, NoDataException +from analysis.webservice.NexusHandler import nexus_handler, DEFAULT_PARAMETERS_SPEC +from analysis.webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler +from analysis.webservice.webmodel import NexusResults, NexusProcessingException, NoDataException from functools import partial @nexus_handler diff --git a/analysis/webservice/algorithms_spark/CorrMapSpark.py b/analysis/webservice/algorithms_spark/CorrMapSpark.py index 71eaf72..f4c8b02 100644 --- a/analysis/webservice/algorithms_spark/CorrMapSpark.py +++ b/analysis/webservice/algorithms_spark/CorrMapSpark.py @@ -19,9 +19,9 @@ from functools import partial import numpy as np -from webservice.NexusHandler import nexus_handler, DEFAULT_PARAMETERS_SPEC -from webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler -from webservice.webmodel import NexusProcessingException, NexusResults, NoDataException +from analysis.webservice.NexusHandler import nexus_handler, DEFAULT_PARAMETERS_SPEC +from analysis.webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler +from analysis.webservice.webmodel import NexusProcessingException, NexusResults, NoDataException @nexus_handler diff --git a/analysis/webservice/algorithms_spark/DailyDifferenceAverageSpark.py b/analysis/webservice/algorithms_spark/DailyDifferenceAverageSpark.py index b424578..67fb730 100644 --- a/analysis/webservice/algorithms_spark/DailyDifferenceAverageSpark.py +++ b/analysis/webservice/algorithms_spark/DailyDifferenceAverageSpark.py @@ -23,9 +23,9 @@ from nexustiles.nexustiles import NexusTileService from shapely import wkt from shapely.geometry import Polygon -from webservice.NexusHandler import nexus_handler -from webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler -from webservice.webmodel import NexusResults, NexusProcessingException +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler +from analysis.webservice.webmodel import NexusResults, NexusProcessingException SENTINEL = 'STOP' diff --git a/analysis/webservice/algorithms_spark/HofMoellerSpark.py b/analysis/webservice/algorithms_spark/HofMoellerSpark.py index d50006a..857b186 100644 --- a/analysis/webservice/algorithms_spark/HofMoellerSpark.py +++ b/analysis/webservice/algorithms_spark/HofMoellerSpark.py @@ -26,10 +26,10 @@ from matplotlib import cm from matplotlib.ticker import FuncFormatter from pytz import timezone -from webservice.NexusHandler import nexus_handler -from webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler -from webservice.algorithms_spark import utils -from webservice.webmodel import NexusResults, NoDataException, NexusProcessingException +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler +from analysis.webservice.algorithms_spark import utils +from analysis.webservice.webmodel import NexusResults, NoDataException, NexusProcessingException EPOCH = timezone('UTC').localize(datetime(1970, 1, 1)) ISO_8601 = '%Y-%m-%dT%H:%M:%SZ' diff --git a/analysis/webservice/algorithms_spark/Matchup.py b/analysis/webservice/algorithms_spark/Matchup.py index 7c7f551..b3420f3 100644 --- a/analysis/webservice/algorithms_spark/Matchup.py +++ b/analysis/webservice/algorithms_spark/Matchup.py @@ -31,15 +31,15 @@ from shapely import wkt from shapely.geometry import box import functools -from webservice.NexusHandler import nexus_handler -from webservice.algorithms_spark.NexusCalcSparkTornadoHandler import NexusCalcSparkTornadoHandler -from webservice.algorithms.doms import config as edge_endpoints -from webservice.algorithms.doms import values as doms_values -from webservice.algorithms.doms.ResultsStorage import ResultsStorage -from webservice.algorithms.doms.insitu import query_insitu as query_edge -from webservice.algorithms.doms.insitu import query_insitu_schema -from webservice.webmodel import NexusProcessingException -from webservice.webmodel.NexusExecutionResults import ExecutionStatus +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms_spark.NexusCalcSparkTornadoHandler import NexusCalcSparkTornadoHandler +from analysis.webservice.algorithms.doms import config as edge_endpoints +from analysis.webservice.algorithms.doms import values as doms_values +from analysis.webservice.algorithms.doms.ResultsStorage import ResultsStorage +from analysis.webservice.algorithms.doms.insitu import query_insitu as query_edge +from analysis.webservice.algorithms.doms.insitu import query_insitu_schema +from analysis.webservice.webmodel import NexusProcessingException +from analysis.webservice.webmodel.NexusExecutionResults import ExecutionStatus EPOCH = timezone('UTC').localize(datetime(1970, 1, 1)) ISO_8601 = '%Y-%m-%dT%H:%M:%S%z' diff --git a/analysis/webservice/algorithms_spark/MatchupDoms.py b/analysis/webservice/algorithms_spark/MatchupDoms.py index 114b08b..bd3971e 100644 --- a/analysis/webservice/algorithms_spark/MatchupDoms.py +++ b/analysis/webservice/algorithms_spark/MatchupDoms.py @@ -34,13 +34,13 @@ from shapely.geometry import Point from shapely.geometry import box from shapely.geos import WKTReadingError -from webservice.NexusHandler import nexus_handler -from webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler -from webservice.algorithms.doms import config as edge_endpoints -from webservice.algorithms.doms import values as doms_values -from webservice.algorithms.doms.BaseDomsHandler import DomsQueryResults -from webservice.algorithms.doms.ResultsStorage import ResultsStorage -from webservice.webmodel import NexusProcessingException +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler +from analysis.webservice.algorithms.doms import config as edge_endpoints +from analysis.webservice.algorithms.doms import values as doms_values +from analysis.webservice.algorithms.doms.BaseDomsHandler import DomsQueryResults +from analysis.webservice.algorithms.doms.ResultsStorage import ResultsStorage +from analysis.webservice.webmodel import NexusProcessingException EPOCH = timezone('UTC').localize(datetime(1970, 1, 1)) ISO_8601 = '%Y-%m-%dT%H:%M:%S%z' diff --git a/analysis/webservice/algorithms_spark/MaximaMinimaSpark.py b/analysis/webservice/algorithms_spark/MaximaMinimaSpark.py index 7521d37..afb8623 100644 --- a/analysis/webservice/algorithms_spark/MaximaMinimaSpark.py +++ b/analysis/webservice/algorithms_spark/MaximaMinimaSpark.py @@ -21,9 +21,9 @@ import numpy as np import shapely.geometry from pytz import timezone -from webservice.NexusHandler import nexus_handler -from webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler -from webservice.webmodel import NexusResults, NexusProcessingException, NoDataException +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler +from analysis.webservice.webmodel import NexusResults, NexusProcessingException, NoDataException EPOCH = timezone('UTC').localize(datetime(1970, 1, 1)) ISO_8601 = '%Y-%m-%dT%H:%M:%S%z' diff --git a/analysis/webservice/algorithms_spark/NexusCalcSparkHandler.py b/analysis/webservice/algorithms_spark/NexusCalcSparkHandler.py index 4499773..4e0c3ee 100644 --- a/analysis/webservice/algorithms_spark/NexusCalcSparkHandler.py +++ b/analysis/webservice/algorithms_spark/NexusCalcSparkHandler.py @@ -17,9 +17,9 @@ 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 +from analysis.webservice.algorithms.NexusCalcHandler import NexusCalcHandler +from analysis.webservice.metrics import MetricsRecord, SparkAccumulatorMetricsField, NumberMetricsField +from analysis.webservice.webmodel import NexusProcessingException logger = logging.getLogger(__name__) diff --git a/analysis/webservice/algorithms_spark/NexusCalcSparkTornadoHandler.py b/analysis/webservice/algorithms_spark/NexusCalcSparkTornadoHandler.py index c2a38c5..5ed5c28 100644 --- a/analysis/webservice/algorithms_spark/NexusCalcSparkTornadoHandler.py +++ b/analysis/webservice/algorithms_spark/NexusCalcSparkTornadoHandler.py @@ -14,7 +14,7 @@ # limitations under the License. import logging -from webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler +from analysis.webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler logger = logging.getLogger(__name__) diff --git a/analysis/webservice/algorithms_spark/TimeAvgMapSpark.py b/analysis/webservice/algorithms_spark/TimeAvgMapSpark.py index 750ba59..58e1e01 100644 --- a/analysis/webservice/algorithms_spark/TimeAvgMapSpark.py +++ b/analysis/webservice/algorithms_spark/TimeAvgMapSpark.py @@ -20,9 +20,9 @@ import numpy as np import shapely.geometry from pytz import timezone -from webservice.NexusHandler import nexus_handler -from webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler -from webservice.webmodel import NexusResults, NexusProcessingException, NoDataException +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler +from analysis.webservice.webmodel import NexusResults, NexusProcessingException, NoDataException EPOCH = timezone('UTC').localize(datetime(1970, 1, 1)) ISO_8601 = '%Y-%m-%dT%H:%M:%S%z' diff --git a/analysis/webservice/algorithms_spark/TimeSeriesSpark.py b/analysis/webservice/algorithms_spark/TimeSeriesSpark.py index 90ae14d..10f798d 100644 --- a/analysis/webservice/algorithms_spark/TimeSeriesSpark.py +++ b/analysis/webservice/algorithms_spark/TimeSeriesSpark.py @@ -29,11 +29,11 @@ import shapely.wkt from backports.functools_lru_cache import lru_cache from pytz import timezone from scipy import stats -from webservice import Filtering as filtering -from webservice.NexusHandler import nexus_handler -from webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler -from webservice.algorithms_spark import utils -from webservice.webmodel import NexusResults, NoDataException, NexusProcessingException +from analysis.webservice.import Filtering as filtering +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler +from analysis.webservice.algorithms_spark import utils +from analysis.webservice.webmodel import NexusResults, NoDataException, NexusProcessingException EPOCH = timezone('UTC').localize(datetime(1970, 1, 1)) ISO_8601 = '%Y-%m-%dT%H:%M:%S%z' diff --git a/analysis/webservice/algorithms_spark/VarianceSpark.py b/analysis/webservice/algorithms_spark/VarianceSpark.py index 7c217da..6d55463 100644 --- a/analysis/webservice/algorithms_spark/VarianceSpark.py +++ b/analysis/webservice/algorithms_spark/VarianceSpark.py @@ -21,9 +21,9 @@ import numpy as np import shapely.geometry from pytz import timezone -from webservice.NexusHandler import nexus_handler -from webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler -from webservice.webmodel import NexusResults, NexusProcessingException, NoDataException +from analysis.webservice.NexusHandler import nexus_handler +from analysis.webservice.algorithms_spark.NexusCalcSparkHandler import NexusCalcSparkHandler +from analysis.webservice.webmodel import NexusResults, NexusProcessingException, NoDataException EPOCH = timezone('UTC').localize(datetime(1970, 1, 1)) ISO_8601 = '%Y-%m-%dT%H:%M:%S%z' diff --git a/analysis/webservice/nexus_tornado/app_builders/HandlerArgsBuilder.py b/analysis/webservice/nexus_tornado/app_builders/HandlerArgsBuilder.py index f2d6f1b..11ca340 100644 --- a/analysis/webservice/nexus_tornado/app_builders/HandlerArgsBuilder.py +++ b/analysis/webservice/nexus_tornado/app_builders/HandlerArgsBuilder.py @@ -14,7 +14,7 @@ # limitations under the License. import tornado -import webservice.algorithms_spark.NexusCalcSparkHandler +import analysis.webservice.algorithms_spark.NexusCalcSparkHandler from .SparkContextBuilder import SparkContextBuilder diff --git a/analysis/webservice/nexus_tornado/app_builders/NexusAppBuilder.py b/analysis/webservice/nexus_tornado/app_builders/NexusAppBuilder.py index afe7d69..9bd30b2 100644 --- a/analysis/webservice/nexus_tornado/app_builders/NexusAppBuilder.py +++ b/analysis/webservice/nexus_tornado/app_builders/NexusAppBuilder.py @@ -19,8 +19,8 @@ from functools import partial import pkg_resources import tornado from nexustiles.nexustiles import NexusTileService -from webservice import NexusHandler -from webservice.nexus_tornado.request.handlers import NexusRequestHandler +from analysis.webservice.import NexusHandler +from analysis.webservice.nexus_tornado.request.handlers import NexusRequestHandler from .HandlerArgsBuilder import HandlerArgsBuilder diff --git a/analysis/webservice/nexus_tornado/app_builders/RedirectAppBuilder.py b/analysis/webservice/nexus_tornado/app_builders/RedirectAppBuilder.py index a8e41c2..d38954b 100644 --- a/analysis/webservice/nexus_tornado/app_builders/RedirectAppBuilder.py +++ b/analysis/webservice/nexus_tornado/app_builders/RedirectAppBuilder.py @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from webservice.redirect import RedirectHandler -from webservice.redirect import RemoteCollectionMatcher +from analysis.webservice.redirect import RedirectHandler +from analysis.webservice.redirect import RemoteCollectionMatcher import tornado diff --git a/analysis/webservice/nexus_tornado/request/handlers/NexusRequestHandler.py b/analysis/webservice/nexus_tornado/request/handlers/NexusRequestHandler.py index 95bddf4..3add956 100644 --- a/analysis/webservice/nexus_tornado/request/handlers/NexusRequestHandler.py +++ b/analysis/webservice/nexus_tornado/request/handlers/NexusRequestHandler.py @@ -18,9 +18,9 @@ import logging import tornado.gen import tornado.ioloop -from webservice.nexus_tornado.request.renderers import NexusRendererFactory -from webservice.webmodel import NexusRequestObjectTornadoFree, NexusRequestObject, NexusProcessingException -from webservice.algorithms_spark.NexusCalcSparkTornadoHandler import NexusCalcSparkTornadoHandler +from analysis.webservice.nexus_tornado.request.renderers import NexusRendererFactory +from analysis.webservice.webmodel import NexusRequestObjectTornadoFree, NexusRequestObject, NexusProcessingException +from analysis.webservice.algorithms_spark.NexusCalcSparkTornadoHandler import NexusCalcSparkTornadoHandler class NexusRequestHandler(tornado.web.RequestHandler): diff --git a/analysis/webservice/nexus_tornado/request/renderers/NexusCSVRenderer.py b/analysis/webservice/nexus_tornado/request/renderers/NexusCSVRenderer.py index 38c2ec0..257797a 100644 --- a/analysis/webservice/nexus_tornado/request/renderers/NexusCSVRenderer.py +++ b/analysis/webservice/nexus_tornado/request/renderers/NexusCSVRenderer.py @@ -15,7 +15,7 @@ import sys import traceback -from webservice.webmodel import NexusProcessingException +from analysis.webservice.webmodel import NexusProcessingException class NexusCSVRenderer(object): diff --git a/analysis/webservice/nexus_tornado/request/renderers/NexusNETCDFRenderer.py b/analysis/webservice/nexus_tornado/request/renderers/NexusNETCDFRenderer.py index 271081d..e0c32b2 100644 --- a/analysis/webservice/nexus_tornado/request/renderers/NexusNETCDFRenderer.py +++ b/analysis/webservice/nexus_tornado/request/renderers/NexusNETCDFRenderer.py @@ -15,7 +15,7 @@ import sys import traceback -from webservice.webmodel import NexusProcessingException +from analysis.webservice.webmodel import NexusProcessingException class NexusNETCDFRenderer(object): diff --git a/analysis/webservice/nexus_tornado/request/renderers/NexusPNGRenderer.py b/analysis/webservice/nexus_tornado/request/renderers/NexusPNGRenderer.py index c51ce20..34f4df8 100644 --- a/analysis/webservice/nexus_tornado/request/renderers/NexusPNGRenderer.py +++ b/analysis/webservice/nexus_tornado/request/renderers/NexusPNGRenderer.py @@ -15,7 +15,7 @@ import sys import traceback -from webservice.webmodel import NexusProcessingException +from analysis.webservice.webmodel import NexusProcessingException class NexusPNGRenderer(object): diff --git a/analysis/webservice/nexus_tornado/request/renderers/NexusZIPRenderer.py b/analysis/webservice/nexus_tornado/request/renderers/NexusZIPRenderer.py index 524aa7b..27d8c24 100644 --- a/analysis/webservice/nexus_tornado/request/renderers/NexusZIPRenderer.py +++ b/analysis/webservice/nexus_tornado/request/renderers/NexusZIPRenderer.py @@ -15,7 +15,7 @@ import sys import traceback -from webservice.webmodel import NexusProcessingException +from analysis.webservice.webmodel import NexusProcessingException class NexusZIPRenderer(object): diff --git a/analysis/webservice/redirect/RedirectHandler.py b/analysis/webservice/redirect/RedirectHandler.py index b1f9745..0a35c2d 100644 --- a/analysis/webservice/redirect/RedirectHandler.py +++ b/analysis/webservice/redirect/RedirectHandler.py @@ -16,7 +16,7 @@ import tornado.web import tornado.gen import logging -from webservice.webmodel.RequestParameters import RequestParameters +from analysis.webservice.webmodel.RequestParameters import RequestParameters logger = logging.getLogger(__name__) diff --git a/analysis/webservice/redirect/RemoteCollectionMatcher.py b/analysis/webservice/redirect/RemoteCollectionMatcher.py index af984aa..de01b1d 100644 --- a/analysis/webservice/redirect/RemoteCollectionMatcher.py +++ b/analysis/webservice/redirect/RemoteCollectionMatcher.py @@ -15,7 +15,7 @@ import yaml from tornado.routing import Matcher -from webservice.webmodel.RequestParameters import RequestParameters +from analysis.webservice.webmodel.RequestParameters import RequestParameters from tornado.httputil import HTTPServerRequest diff --git a/analysis/webservice/webapp.py b/analysis/webservice/webapp.py index e060d3c..01250e0 100644 --- a/analysis/webservice/webapp.py +++ b/analysis/webservice/webapp.py @@ -26,6 +26,9 @@ from tornado.options import define, options, parse_command_line from webservice.redirect import RemoteCollectionMatcher from webservice.nexus_tornado.app_builders import NexusAppBuilder from webservice.nexus_tornado.app_builders import RedirectAppBuilder +from analysis.webservice.redirect import RemoteCollectionMatcher +from analysis.webservice.nexus_tornado.app_builders import NexusAppBuilder +from analysis.webservice.nexus_tornado.app_builders import RedirectAppBuilder def inject_args_in_config(args, config): @@ -49,7 +52,6 @@ def inject_args_in_config(args, config): def main(): - logging.basicConfig( level=logging.DEBUG, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s', @@ -58,6 +60,9 @@ def main(): log = logging.getLogger(__name__) + for line in banner: + log.info(line) + web_config = configparser.RawConfigParser() web_config.read_file(open(os.path.join(os.path.dirname(__file__), "config", "web.ini"))) diff --git a/analysis/webservice/webapp_livy.py b/analysis/webservice/webapp_livy.py index 73d277d..e9688cd 100644 --- a/analysis/webservice/webapp_livy.py +++ b/analysis/webservice/webapp_livy.py @@ -19,9 +19,9 @@ import logging import sys import os import pkg_resources -from webservice import nexus_tornado +from analysis.webservice.import nexus_tornado from .nexus_tornado.options import define, options, parse_command_line -from webservice.NexusLivyHandler import LivyHandler +from analysis.webservice.NexusLivyHandler import LivyHandler class RunFileHandler(nexus_tornado.web.RequestHandler): diff --git a/analysis/webservice/webmodel/Exceptions.py b/analysis/webservice/webmodel/Exceptions.py index 8032244..af86efe 100644 --- a/analysis/webservice/webmodel/Exceptions.py +++ b/analysis/webservice/webmodel/Exceptions.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from webservice.webmodel.StandardNexusErrors import StandardNexusErrors +from analysis.webservice.webmodel.StandardNexusErrors import StandardNexusErrors class NexusProcessingException(Exception): diff --git a/analysis/webservice/webmodel/NexusRequestObject.py b/analysis/webservice/webmodel/NexusRequestObject.py index bbd2828..a75c46c 100644 --- a/analysis/webservice/webmodel/NexusRequestObject.py +++ b/analysis/webservice/webmodel/NexusRequestObject.py @@ -20,8 +20,8 @@ from decimal import Decimal from pytz import UTC from shapely.geometry import Polygon -from webservice.webmodel.RequestParameters import RequestParameters -from webservice.webmodel.StatsComputeOptions import StatsComputeOptions +from analysis.webservice.webmodel.RequestParameters import RequestParameters +from analysis.webservice.webmodel.StatsComputeOptions import StatsComputeOptions class NexusRequestObject(StatsComputeOptions): diff --git a/analysis/webservice/webmodel/NexusRequestObjectTornadoFree.py b/analysis/webservice/webmodel/NexusRequestObjectTornadoFree.py index dc49867..b5ddae6 100644 --- a/analysis/webservice/webmodel/NexusRequestObjectTornadoFree.py +++ b/analysis/webservice/webmodel/NexusRequestObjectTornadoFree.py @@ -19,8 +19,8 @@ from datetime import datetime from decimal import Decimal from pytz import UTC -from webservice.webmodel.RequestParameters import RequestParameters -from webservice.webmodel.StatsComputeOptions import StatsComputeOptions +from analysis.webservice.webmodel.RequestParameters import RequestParameters +from analysis.webservice.webmodel.StatsComputeOptions import StatsComputeOptions class NexusRequestObjectTornadoFree(StatsComputeOptions): diff --git a/analysis/webservice/webmodel/NexusResults.py b/analysis/webservice/webmodel/NexusResults.py index 42c1ca0..8e91f3a 100644 --- a/analysis/webservice/webmodel/NexusResults.py +++ b/analysis/webservice/webmodel/NexusResults.py @@ -17,7 +17,7 @@ import json from datetime import datetime from pytz import timezone -from webservice.webmodel.CustomEncoder import CustomEncoder +from analysis.webservice.webmodel.CustomEncoder import CustomEncoder ISO_8601 = '%Y-%m-%dT%H:%M:%S%z' diff --git a/tools/doms-data-tools/update_values_type.py b/tools/doms-data-tools/update_values_type.py index c5e5ada..36810f1 100644 --- a/tools/doms-data-tools/update_values_type.py +++ b/tools/doms-data-tools/update_values_type.py @@ -30,7 +30,7 @@ try: except: pass -from webservice.algorithms.doms.DomsInitialization import DomsInitializer +from analysis.webservice.algorithms.doms.DomsInitialization import DomsInitializer BATCH_SIZE = 1024 log = logging.getLogger(__name__)
