mv to errors

Author: pcrespov

Diff for: services/api-server/src/simcore_service_api_server/api/routes/files.py

@@ -30,6 +30,7 @@
 from starlette.responses import RedirectResponse
 
 from ..._meta import API_VTAG
+from ...errors.services_exception_handling import DEFAULT_BACKEND_SERVICE_STATUS_CODES
 from ...models.pagination import Page, PaginationParams
 from ...models.schemas.errors import ErrorGet
 from ...models.schemas.files import (
@@ -39,7 +40,6 @@
     FileUploadData,
     UploadLinks,
 )
-from ...services.service_exception_handling import DEFAULT_BACKEND_SERVICE_STATUS_CODES
 from ...services.storage import StorageApi, StorageFileMetaData, to_file_api_model
 from ..dependencies.authentication import get_current_user_id
 from ..dependencies.services import get_api_client

Diff for: services/api-server/src/simcore_service_api_server/api/routes/solvers.py

@@ -9,12 +9,12 @@
 from pydantic import ValidationError
 from pydantic.errors import PydanticValueError
 
+from ...errors.services_exception_handling import DEFAULT_BACKEND_SERVICE_STATUS_CODES
 from ...models.basic_types import VersionStr
 from ...models.pagination import OnePage, Page, PaginationParams
 from ...models.schemas.errors import ErrorGet
 from ...models.schemas.solvers import Solver, SolverKeyId, SolverPort
 from ...services.catalog import CatalogApi
-from ...services.service_exception_handling import DEFAULT_BACKEND_SERVICE_STATUS_CODES
 from ..dependencies.application import get_reverse_url_mapper
 from ..dependencies.authentication import get_current_user_id, get_product_name
 from ..dependencies.services import get_api_client

Diff for: services/api-server/src/simcore_service_api_server/api/routes/solvers_jobs.py

@@ -10,6 +10,7 @@
 from models_library.clusters import ClusterID
 from pydantic.types import PositiveInt
 
+from ...errors.services_exception_handling import DEFAULT_BACKEND_SERVICE_STATUS_CODES
 from ...models.basic_types import VersionStr
 from ...models.schemas.errors import ErrorGet
 from ...models.schemas.jobs import (
@@ -23,7 +24,6 @@
 from ...models.schemas.solvers import Solver, SolverKeyId
 from ...services.catalog import CatalogApi
 from ...services.director_v2 import DirectorV2Api
-from ...services.service_exception_handling import DEFAULT_BACKEND_SERVICE_STATUS_CODES
 from ...services.solver_job_models_converters import (
     create_job_from_project,
     create_jobstatus_from_task,

Diff for: services/api-server/src/simcore_service_api_server/api/routes/solvers_jobs_getters.py

@@ -22,6 +22,7 @@
 from servicelib.logging_utils import log_context
 from starlette.background import BackgroundTask
 
+from ...errors.services_exception_handling import DEFAULT_BACKEND_SERVICE_STATUS_CODES
 from ...models.basic_types import LogStreamingResponse, VersionStr
 from ...models.custom_errors import InsufficientCreditsError, MissingWalletError
 from ...models.pagination import Page, PaginationParams
@@ -32,7 +33,6 @@
 from ...services.catalog import CatalogApi
 from ...services.director_v2 import DirectorV2Api, DownloadLink, NodeName
 from ...services.log_streaming import LogDistributor, LogStreamer
-from ...services.service_exception_handling import DEFAULT_BACKEND_SERVICE_STATUS_CODES
 from ...services.solver_job_models_converters import create_job_from_project
 from ...services.solver_job_outputs import ResultsTypes, get_solver_output_results
 from ...services.storage import StorageApi, to_file_api_model

Diff for: services/api-server/src/simcore_service_api_server/api/routes/users.py

@@ -3,9 +3,9 @@
 
 from fastapi import APIRouter, Depends, Security, status
 
+from ...errors.services_exception_handling import DEFAULT_BACKEND_SERVICE_STATUS_CODES
 from ...models.schemas.errors import ErrorGet
 from ...models.schemas.profiles import Profile, ProfileUpdate
-from ...services.service_exception_handling import DEFAULT_BACKEND_SERVICE_STATUS_CODES
 from ...services.webserver import AuthSession
 from ..dependencies.webserver import get_webserver_session
 

Diff for: services/api-server/src/simcore_service_api_server/api/routes/wallets.py

@@ -4,8 +4,8 @@
 from fastapi import APIRouter, Depends, status
 from models_library.api_schemas_webserver.wallets import WalletGetWithAvailableCredits
 
+from ...errors.services_exception_handling import DEFAULT_BACKEND_SERVICE_STATUS_CODES
 from ...models.schemas.errors import ErrorGet
-from ...services.service_exception_handling import DEFAULT_BACKEND_SERVICE_STATUS_CODES
 from ..dependencies.webserver import AuthSession, get_webserver_session
 from ._common import API_SERVER_DEV_FEATURES_ENABLED
 

Diff for: services/api-server/src/simcore_service_api_server/services/service_exception_handling.py renamed to services/api-server/src/simcore_service_api_server/errors/services_exception_handling.py

@@ -12,10 +12,10 @@
 from pydantic import Extra, ValidationError, parse_obj_as, parse_raw_as
 from settings_library.catalog import CatalogSettings
 
+from ..errors.services_exception_handling import service_exception_mapper
 from ..models.basic_types import VersionStr
 from ..models.schemas.solvers import LATEST_VERSION, Solver, SolverKeyId, SolverPort
 from ..utils.client_base import BaseServiceClientApi, setup_client_instance
-from .service_exception_handling import service_exception_mapper
 
 _logger = logging.getLogger(__name__)
 

Diff for: services/api-server/src/simcore_service_api_server/services/catalog.py

@@ -13,9 +13,9 @@
 
 from ..core.settings import DirectorV2Settings
 from ..db.repositories.groups_extra_properties import GroupsExtraPropertiesRepository
+from ..errors.services_exception_handling import service_exception_mapper
 from ..models.schemas.jobs import PercentageInt
 from ..utils.client_base import BaseServiceClientApi, setup_client_instance
-from .service_exception_handling import service_exception_mapper
 
 logger = logging.getLogger(__name__)
 

Diff for: services/api-server/src/simcore_service_api_server/services/director_v2.py

@@ -17,9 +17,9 @@
 from starlette.datastructures import URL
 
 from ..core.settings import StorageSettings
+from ..errors.services_exception_handling import service_exception_mapper
 from ..models.schemas.files import File
 from ..utils.client_base import BaseServiceClientApi, setup_client_instance
-from .service_exception_handling import service_exception_mapper
 
 _logger = logging.getLogger(__name__)
 

Diff for: services/api-server/src/simcore_service_api_server/services/storage.py

@@ -53,17 +53,17 @@
 from tenacity.wait import wait_fixed
 
 from ..core.settings import WebServerSettings
+from ..errors.services_exception_handling import (
+    backend_service_exception_handler,
+    service_exception_mapper,
+)
 from ..models.basic_types import VersionStr
 from ..models.pagination import MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
 from ..models.schemas.jobs import MetaValueType
 from ..models.schemas.profiles import Profile, ProfileUpdate
 from ..models.schemas.solvers import SolverKeyId
 from ..models.schemas.studies import StudyPort
 from ..utils.client_base import BaseServiceClientApi, setup_client_instance
-from .service_exception_handling import (
-    backend_service_exception_handler,
-    service_exception_mapper,
-)
 
 _logger = logging.getLogger(__name__)
 

Diff for: services/api-server/src/simcore_service_api_server/services/webserver.py

@@ -1,7 +1,7 @@
 import pytest
 from fastapi import HTTPException, status
 from httpx import HTTPStatusError, Request, Response
-from simcore_service_api_server.services.service_exception_handling import (
+from simcore_service_api_server.errors.services_exception_handling import (
     service_exception_mapper,
 )