Commit 3cff952c authored by Luc Yriarte's avatar Luc Yriarte
Browse files

Merge branch 'bulk-persistence-model-import' into 'master'

Bulk persistence model import

See merge request !499
parents 44bb3f02 acfbf411
Pipeline #103597 failed with stages
in 73 minutes and 35 seconds
......@@ -13,6 +13,8 @@
# limitations under the License.
from .bulk_uri import BulkURI
from .bulk_filter import BulkReadFilters, BulkReadFilterOperator
from .model_chunking import GetDataParams, DataframeBasicDescribe, DataframeDescribe
from .dask.dask_bulk_storage import DaskBulkStorage
from .dask.dask_bulk_storage_local import make_local_dask_bulk_storage
from .dataframe_persistence import create_and_store_dataframe, get_dataframe, download_bulk
......
from typing import Iterable, NamedTuple, Set, List
from enum import Enum
from app.bulk_persistence.dask.errors import FilterError
from .dask.errors import FilterError
class BulkReadFilterOperator(str, Enum):
......
......@@ -5,7 +5,7 @@ import fsspec
import pandas as pd
from .utils import WDMS_INDEX_NAME
from app.model.model_chunking import DataframeBasicDescribe
from ..model_chunking import DataframeBasicDescribe
# imports from bulk_persistence
from ..json_orient import JSONOrient
......
......@@ -18,8 +18,8 @@ import re
from fastapi import Query
from pydantic import BaseModel, Field
from .filter import BulkReadFilterOperator, BulkFilter
from ..bulk_persistence.dask.errors import FilterError
from .bulk_filter import BulkReadFilterOperator, BulkFilter
from .dask.errors import FilterError
class GetDataParams:
......
......@@ -17,10 +17,8 @@ from fastapi import APIRouter, Depends, HTTPException, Request, status
from osdu.core.api.storage.exceptions import ResourceNotFoundException
from app.model.filter import BulkReadFilters
from app.model.model_chunking import GetDataParams, DataframeBasicDescribe
from app.bulk_persistence import BulkReadFilters, GetDataParams, DataframeBasicDescribe
from app.model.osdu_record_id import split_record_id_version
from app.context import Context, get_ctx
from app.utils import OpenApiHandler
from app.helper.traces import TracingRoute, with_trace
......
......@@ -25,8 +25,7 @@ from app.clients.storage_service_client import get_storage_record_service
from app.context import get_ctx, Context
from app.utils import OpenApiHandler
from app.helper.traces import with_trace
from app.model.filter import BulkReadFilterOperator, BulkReadFilters
from app.model.model_chunking import GetDataParams, DataframeDescribe
from app.bulk_persistence import BulkReadFilterOperator, BulkReadFilters, GetDataParams, DataframeDescribe
from app.routers.bulk.bulk_uri_dependencies import BulkIdAccess
from app.consistency import NoConsistencyChecks, WelllogDataConsistencyChecks, TrajectoryDataConsistencyChecks
......
......@@ -6,9 +6,8 @@ from pandas.testing import assert_frame_equal
from fastapi import HTTPException
from app.bulk_persistence import JSONOrient, MimeTypes
from app.bulk_persistence import JSONOrient, MimeTypes, GetDataParams, DataframeDescribe
from app.bulk_persistence.dask.errors import BulkCurvesNotFound
from app.model.model_chunking import GetDataParams, DataframeDescribe
from app.routers.bulk.bulk_routes import DataFrameRender
from app.routers.bulk.utils import get_df_from_request
from tests.unit.generate_data import generate_df
......
import pytest
from app.bulk_persistence.dask.errors import FilterError
from app.model.model_chunking import GetDataParams
from app.model.filter import BulkReadFilterOperator, BulkReadFilters
from app.bulk_persistence import GetDataParams, \
BulkReadFilterOperator, BulkReadFilters
@pytest.mark.parametrize("filters, expected", [
......
Supports Markdown
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