Skip to content

Commit

Permalink
Remove unused endpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
oyvindeide committed Jan 5, 2024
1 parent e5ee36d commit 7ebb362
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 65 deletions.
2 changes: 0 additions & 2 deletions src/ert/dark_storage/endpoints/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from .experiments import router as experiments_router
from .observations import router as observations_router
from .records import router as records_router
from .responses import router as response_router
from .server import router as server_router
from .updates import router as updates_router

Expand All @@ -16,5 +15,4 @@
router.include_router(observations_router)
router.include_router(updates_router)
router.include_router(misfits_router)
router.include_router(response_router)
router.include_router(server_router)
26 changes: 0 additions & 26 deletions src/ert/dark_storage/endpoints/responses.py

This file was deleted.

16 changes: 1 addition & 15 deletions tests/performance_tests/test_dark_storage_performance.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from ert.async_utils import get_event_loop
from ert.config import ErtConfig
from ert.dark_storage.endpoints import ensembles, experiments, records, responses
from ert.dark_storage.endpoints import ensembles, experiments, records
from ert.enkf_main import EnKFMain
from ert.libres_facade import LibresFacade
from ert.storage import open_storage
Expand Down Expand Up @@ -107,19 +107,6 @@ def get_record_csv(storage, ensemble_id1, keyword, poly_ran):
assert len(record_df1.index) == poly_ran["reals"]


def get_result(storage, ensemble_id1, keyword, poly_ran):
csv = run_in_loop(
responses.get_ensemble_response_dataframe(
db=storage, ensemble_id=ensemble_id1, response_name=keyword
)
).body
response_df1 = pd.read_csv(
io.BytesIO(csv), index_col=0, float_precision="round_trip"
)
assert len(response_df1.columns) == poly_ran["gen_data_entries"]
assert len(response_df1.index) == poly_ran["reals"]


def get_parameters(storage, ensemble_id1, keyword, poly_ran):
parameters_json = run_in_loop(
records.get_ensemble_parameters(storage=storage, ensemble_id=ensemble_id1)
Expand All @@ -133,7 +120,6 @@ def get_parameters(storage, ensemble_id1, keyword, poly_ran):
@pytest.mark.parametrize(
"function",
[
get_result,
get_record_parquet,
get_record_csv,
get_single_record_parquet,
Expand Down
22 changes: 0 additions & 22 deletions tests/unit_tests/dark_storage/test_http_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,28 +94,6 @@ def test_get_response(poly_example_tmp_dir, dark_storage_client):
)
assert ensemble_json2["response_names"][0] == "POLY_RES@0"

resp: Response = dark_storage_client.get(
f"/ensembles/{ensemble_id1}/responses/POLY_RES@0/data"
)
stream = io.BytesIO(resp.content)
response_df1 = pd.read_csv(stream, index_col=0, float_precision="round_trip")

resp: Response = dark_storage_client.get(
f"/ensembles/{ensemble_id2}/responses/POLY_RES@0/data"
)
stream = io.BytesIO(resp.content)
response_df2 = pd.read_csv(stream, index_col=0, float_precision="round_trip")

assert len(response_df1.columns) == 10, (
f"\nexperiment_json: {json.dumps(experiment_json, indent=1)} \n\n"
f"ensemble_json: {json.dumps(ensemble_json, indent=1)}\n"
f" status_code: {resp.status_code}"
)
assert len(response_df1.index) == 3

assert len(response_df2.columns) == 10
assert len(response_df2.index) == 3

resp: Response = dark_storage_client.get(
f"/ensembles/{ensemble_id1}/records/POLY_RES@0",
headers={"accept": "text/csv"},
Expand Down

0 comments on commit 7ebb362

Please sign in to comment.