Commit f758021c authored by Luc Yriarte's avatar Luc Yriarte
Browse files

Merge branch 'master' into extensions-as-modules

parents 25ca23f2 0baf8e13
Pipeline #51553 passed with stages
in 13 minutes and 6 seconds
......@@ -27,7 +27,6 @@ from app.bulk_persistence.bulk_id import BulkId
from app.bulk_persistence.dask.dask_bulk_storage import DaskBulkStorage
from app.bulk_persistence.dask.errors import BulkError, BulkNotFound
from app.clients.storage_service_client import get_storage_record_service
from app.record_utils import fetch_record
from app.bulk_persistence.mime_types import MimeTypes
from app.model.model_chunking import GetDataParams
from app.model.log_bulk import LogBulkHelper
......@@ -40,6 +39,7 @@ from app.routers.common_parameters import (
json_orient_parameter)
from app.routers.sessions import (SessionInternal, UpdateSessionState, UpdateSessionStateValue,
WithSessionStorages, get_session_dependencies)
from app.routers.record_utils import fetch_record
from app.helper.traces import with_trace
router_bulk = APIRouter() # router dedicated to bulk APIs
......
......@@ -44,8 +44,8 @@ from app.model.model_curated import log
from app.model.model_utils import from_record, to_record
from app.routers.ddms_v2.persistence import Persistence
from app.routers.common_parameters import json_orient_parameter, REQUIRED_ROLES_READ, REQUIRED_ROLES_WRITE
from app.routers.record_utils import fetch_record, update_records
from app.utils import Context, OpenApiHandler, OpenApiResponse, get_ctx, load_schema_example
from app.record_utils import fetch_record, update_records
router = APIRouter()
......
......@@ -20,7 +20,6 @@ from fastapi import FastAPI, Depends
from fastapi.openapi.utils import get_openapi
from app import __version__, __build_number__, __app_name__
from app import bulk_utils
from app.auth.auth import require_opendes_authorized_user
from app.conf import Config, check_environment
from app.errors.exception_handlers import add_exception_handlers
......@@ -31,7 +30,7 @@ from app.injector.app_injector import AppInjector
from app.injector.main_injector import MainInjector
from app.middleware import CreateBasicContextMiddleware, TracingMiddleware
from app.middleware.basic_context_middleware import require_data_partition_id
from app.routers import probes, about, sessions
from app.routers import probes, about, sessions, bulk_utils
from app.routers.ddms_v2 import (
ddms_v2,
wellbore_ddms_v2,
......
......@@ -33,6 +33,6 @@ osdu-data-ecosystem-search>=0.3.2, <0.4
osdu-core-lib-python-ibm>=0.0.1, <0.1
osdu-core-lib-python-gcp~=1.1.0
osdu-core-lib-python-azure~=1.1.2
osdu-core-lib-python-azure~=1.2.0
osdu-core-lib-python-aws>=0.0.1, <0.1
osdu-core-lib-python~=1.1.0
......@@ -4,7 +4,7 @@ from io import BytesIO
from fastapi import HTTPException
from app.model.model_chunking import GetDataParams
from app.bulk_utils import DataFrameRender, get_df_from_request
from app.routers.bulk_utils import DataFrameRender, get_df_from_request
import pandas as pd
from pandas.testing import assert_frame_equal
......
......@@ -60,7 +60,7 @@ def client(nope_logger_fixture):
with mock.patch('app.routers.ddms_v2.logset_ddms_v2.get_storage_record_service', mock_storage):
with mock.patch('app.routers.ddms_v2.logset_ddms_v2.get_search_service', mock_search):
with mock.patch('app.routers.ddms_v2.log_ddms_v2.get_storage_record_service', mock_storage_blob):
with mock.patch('app.record_utils.get_storage_record_service', mock_storage_blob):
with mock.patch('app.routers.record_utils.get_storage_record_service', mock_storage_blob):
wdms_app.dependency_overrides[require_opendes_authorized_user] = bypass_authorization
wdms_app.dependency_overrides[require_data_partition_id] = set_default_partition
client = TestClient(wdms_app)
......
......@@ -33,7 +33,7 @@ from app.auth.auth import require_opendes_authorized_user
from app.middleware import require_data_partition_id
from app.wdms_app import wdms_app, app_injector
from app.utils import Context
from app.record_utils import fetch_record, update_records
from app.routers.record_utils import fetch_record, update_records
from tests.unit.test_utils import create_mock_class, nope_logger_fixture, ctx_fixture
from odes_storage.models import CreateUpdateRecordsResponse, Record
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment