reverted location

Author: pcrespov

services/api-server/src/simcore_service_api_server/_service_job.py

@@ -14,7 +14,7 @@
 from .models.schemas.jobs import Job, JobInputs
 from .models.schemas.programs import Program
 from .models.schemas.solvers import Solver
-from .models.solver_job_models_converters import (
+from .services_http.solver_job_models_converters import (
     create_job_from_project,
     create_new_project_for_job,
 )

services/api-server/src/simcore_service_api_server/_service_solvers.py

@@ -19,7 +19,9 @@
 from .api.dependencies.webserver_rpc import get_wb_api_rpc_client
 from .models.schemas.jobs import JobInputs, JobModel
 from .models.schemas.solvers import Solver, SolverKeyId
-from .models.solver_job_models_converters import create_job_inputs_from_node_inputs
+from .services_http.solver_job_models_converters import (
+    create_job_inputs_from_node_inputs,
+)
 from .services_rpc.catalog import CatalogService
 from .services_rpc.wb_api_server import WbApiRpcClient
 

services/api-server/src/simcore_service_api_server/api/routes/solvers_jobs.py

@@ -27,11 +27,11 @@
     JobStatus,
 )
 from ...models.schemas.solvers import Solver, SolverKeyId
-from ...models.solver_job_models_converters import (
-    create_jobstatus_from_task,
-)
 from ...services_http.director_v2 import DirectorV2Api
 from ...services_http.jobs import replace_custom_metadata, start_project, stop_project
+from ...services_http.solver_job_models_converters import (
+    create_jobstatus_from_task,
+)
 from ...services_rpc.wb_api_server import WbApiRpcClient
 from ..dependencies.application import get_reverse_url_mapper
 from ..dependencies.authentication import get_current_user_id, get_product_name

services/api-server/src/simcore_service_api_server/api/routes/solvers_jobs_getters.py

@@ -41,13 +41,13 @@
     WalletGetWithAvailableCreditsLegacy,
 )
 from ...models.schemas.solvers import SolverKeyId
-from ...models.solver_job_models_converters import create_job_from_project
 from ...services_http.director_v2 import DirectorV2Api
 from ...services_http.jobs import (
     get_custom_metadata,
     raise_if_job_not_associated_with_solver,
 )
 from ...services_http.log_streaming import LogDistributor, LogStreamer
+from ...services_http.solver_job_models_converters import create_job_from_project
 from ...services_http.solver_job_outputs import ResultsTypes, get_solver_output_results
 from ...services_http.storage import StorageApi, to_file_api_model
 from ..dependencies.application import get_reverse_url_mapper

services/api-server/src/simcore_service_api_server/api/routes/studies_jobs.py

@@ -29,14 +29,14 @@
     JobStatus,
 )
 from ...models.schemas.studies import JobLogsMap, Study, StudyID
-from ...models.solver_job_models_converters import create_jobstatus_from_task
 from ...services_http.director_v2 import DirectorV2Api
 from ...services_http.jobs import (
     get_custom_metadata,
     replace_custom_metadata,
     start_project,
     stop_project,
 )
+from ...services_http.solver_job_models_converters import create_jobstatus_from_task
 from ...services_http.storage import StorageApi
 from ...services_http.study_job_models_converters import (
     create_job_from_study,

services/api-server/src/simcore_service_api_server/services_http/jobs.py

@@ -17,8 +17,8 @@
     JobPricingSpecification,
     JobStatus,
 )
-from ..models.solver_job_models_converters import create_jobstatus_from_task
 from .director_v2 import DirectorV2Api
+from .solver_job_models_converters import create_jobstatus_from_task
 from .webserver import AuthSession
 
 _logger = logging.getLogger(__name__)

services/api-server/src/simcore_service_api_server/models/solver_job_models_converters.py renamed to services/api-server/src/simcore_service_api_server/services_http/solver_job_models_converters.py

@@ -17,10 +17,9 @@
 from models_library.projects_nodes import InputID
 from pydantic import HttpUrl, TypeAdapter
 
-from ..services_http.director_v2 import ComputationTaskGet
-from .domain.projects import InputTypes, Node, SimCoreFileLink
-from .schemas.files import File
-from .schemas.jobs import (
+from ..models.domain.projects import InputTypes, Node, SimCoreFileLink
+from ..models.schemas.files import File
+from ..models.schemas.jobs import (
     ArgumentTypes,
     Job,
     JobInputs,
@@ -30,8 +29,9 @@
     get_runner_url,
     get_url,
 )
-from .schemas.programs import Program
-from .schemas.solvers import Solver
+from ..models.schemas.programs import Program
+from ..models.schemas.solvers import Solver
+from .director_v2 import ComputationTaskGet
 
 # UTILS ------
 _BASE_UUID = uuid.UUID("231e13db-6bc6-4f64-ba56-2ee2c73b9f09")

services/api-server/tests/unit/test_models_solver_job_models_converters.py renamed to services/api-server/tests/unit/test_services_solver_job_models_converters.py

@@ -10,7 +10,7 @@
 from simcore_service_api_server.models.schemas.files import File
 from simcore_service_api_server.models.schemas.jobs import ArgumentTypes, Job, JobInputs
 from simcore_service_api_server.models.schemas.solvers import Solver
-from simcore_service_api_server.models.solver_job_models_converters import (
+from simcore_service_api_server.services_http.solver_job_models_converters import (
     create_job_from_project,
     create_job_inputs_from_node_inputs,
     create_jobstatus_from_task,