ert 19.0.0__py3-none-any.whl → 19.0.0rc1__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- ert/__main__.py +94 -63
- ert/analysis/_es_update.py +11 -14
- ert/config/_create_observation_dataframes.py +12 -228
- ert/config/_observations.py +164 -152
- ert/config/_read_summary.py +4 -5
- ert/config/ert_config.py +1 -56
- ert/config/observation_config_migrations.py +793 -0
- ert/config/rft_config.py +1 -1
- ert/dark_storage/compute/misfits.py +0 -42
- ert/dark_storage/endpoints/__init__.py +0 -2
- ert/dark_storage/endpoints/experiments.py +0 -3
- ert/dark_storage/json_schema/experiment.py +0 -1
- ert/field_utils/grdecl_io.py +9 -26
- ert/gui/main_window.py +2 -0
- ert/gui/tools/manage_experiments/export_dialog.py +4 -0
- ert/gui/tools/manage_experiments/storage_info_widget.py +1 -5
- ert/gui/tools/plot/plot_api.py +10 -10
- ert/gui/tools/plot/plot_widget.py +12 -14
- ert/gui/tools/plot/plot_window.py +1 -10
- ert/services/__init__.py +7 -3
- ert/services/_storage_main.py +59 -22
- ert/services/ert_server.py +186 -24
- ert/shared/version.py +3 -3
- ert/storage/local_ensemble.py +3 -107
- ert/storage/local_experiment.py +0 -16
- ert/storage/local_storage.py +1 -3
- ert/utils/__init__.py +20 -0
- {ert-19.0.0.dist-info → ert-19.0.0rc1.dist-info}/METADATA +2 -2
- {ert-19.0.0.dist-info → ert-19.0.0rc1.dist-info}/RECORD +40 -47
- {ert-19.0.0.dist-info → ert-19.0.0rc1.dist-info}/WHEEL +1 -1
- everest/bin/everest_script.py +5 -5
- everest/bin/kill_script.py +2 -2
- everest/bin/monitor_script.py +2 -2
- everest/bin/utils.py +4 -4
- everest/detached/everserver.py +6 -6
- everest/gui/main_window.py +2 -2
- everest/util/__init__.py +1 -19
- ert/dark_storage/compute/__init__.py +0 -0
- ert/dark_storage/endpoints/compute/__init__.py +0 -0
- ert/dark_storage/endpoints/compute/misfits.py +0 -95
- ert/services/_base_service.py +0 -387
- ert/services/webviz_ert_service.py +0 -20
- ert/shared/storage/command.py +0 -38
- ert/shared/storage/extraction.py +0 -42
- ert/storage/migration/to23.py +0 -49
- {ert-19.0.0.dist-info → ert-19.0.0rc1.dist-info}/entry_points.txt +0 -0
- {ert-19.0.0.dist-info → ert-19.0.0rc1.dist-info}/licenses/COPYING +0 -0
- {ert-19.0.0.dist-info → ert-19.0.0rc1.dist-info}/top_level.txt +0 -0
|
@@ -18,7 +18,7 @@ _ert/forward_model_runner/reporting/statemachine.py,sha256=4W-GfsqTWDFdI2774ghIj
|
|
|
18
18
|
_ert/forward_model_runner/util/__init__.py,sha256=F3uc8Yk-UAAeNMsQTRUjGU8KVNv2av9xAM7lTm3PNJs,65
|
|
19
19
|
_ert/forward_model_runner/util/data.py,sha256=PWXDgmjdmjLLKl2Z7zdEpXIheDYNSa60LkFay6s4-h0,1175
|
|
20
20
|
ert/__init__.py,sha256=sL2Cq4_YZRcvX-0JVOijZ5cXBteTkBx7Zs9l_SNPQnY,932
|
|
21
|
-
ert/__main__.py,sha256=
|
|
21
|
+
ert/__main__.py,sha256=zKtdA5YVQFsofSebSHDtijI4usf--DB3TAiHZHaToBM,26389
|
|
22
22
|
ert/base_model_context.py,sha256=TmZlWOPL0dfE8D2kIkGU108A6tgHgeB2tG-vEW4bGZA,853
|
|
23
23
|
ert/constant_filenames.py,sha256=_oyoLi3nnxQXJxbPj8slcs-w5t9yCxnom_jwIl1iNwU,205
|
|
24
24
|
ert/libres_facade.py,sha256=iQpgyoIvNK2dqklTOahIknyPiLXtpq9hAsWmAVWQhb4,3023
|
|
@@ -32,7 +32,7 @@ ert/trace.py,sha256=m2ZjKd1nf7LjBM2lL0fk1cNF04HnQs8blZhQbTXgcB0,1274
|
|
|
32
32
|
ert/workflow_runner.py,sha256=3x0k6D_2euNLf2YbjjIPwICz7q7OvrvIoKUQuBcBsuc,7334
|
|
33
33
|
ert/analysis/__init__.py,sha256=NNLGQG9gex6lJ8IZjEg_tXTfSeJceRA9zjOek-UeY0Y,591
|
|
34
34
|
ert/analysis/_enif_update.py,sha256=Oh9oUiMLbBT8o3TPl9x3ZR24gqBpIn6nFPwrOjMNtnY,7654
|
|
35
|
-
ert/analysis/_es_update.py,sha256=
|
|
35
|
+
ert/analysis/_es_update.py,sha256=TpW0Y66yKTQYRFGwEaTgD0-rBEopBubr5jwVAo66NEM,17044
|
|
36
36
|
ert/analysis/_update_commons.py,sha256=y2MYW_B02TDBcnuPJBh3WWqBCUmL0f9JoZ8nB_-K0pQ,12375
|
|
37
37
|
ert/analysis/event.py,sha256=vBYqtTl5DXePPWHTLX9bROmGTD2ixcrQh4K07g-UikM,2248
|
|
38
38
|
ert/analysis/misfit_preprocessor.py,sha256=2MjlL2yIg5KQpqWiD3675-hoy_5QM49pWQ7VXK4rous,8001
|
|
@@ -42,11 +42,11 @@ ert/cli/main.py,sha256=oWiIUF5r2E1QOforFY-nQ2k3mrE74EDqrk8QcjcdfmE,6567
|
|
|
42
42
|
ert/cli/monitor.py,sha256=ad6aT1Ch-To5XpQR6eR1SMCBZ9HNRjPE9X8o6TEGURg,5973
|
|
43
43
|
ert/cli/workflow.py,sha256=QKbpHr_Tc5NQjSNL1tB4uCo9ykTkqvwohywbjGAm-r4,1260
|
|
44
44
|
ert/config/__init__.py,sha256=RVLt_v8nF9xjG51smLK9OXZT6yAH5KEmSgnFYYvVogU,4310
|
|
45
|
-
ert/config/_create_observation_dataframes.py,sha256=
|
|
45
|
+
ert/config/_create_observation_dataframes.py,sha256=je_UPh9_1SAcQXafmfh9Djr8JqCMSXyEl1ijODXKjrg,11115
|
|
46
46
|
ert/config/_design_matrix_validator.py,sha256=_eEk07L4c7sv8WwTYYGHc_rT1HEOZDqLrgla0r9rpj0,1308
|
|
47
47
|
ert/config/_get_num_cpu.py,sha256=IXOEHkGJEz7kEOysc29q-jpaXqbWeu-Y4FlQvGp0ryM,7684
|
|
48
|
-
ert/config/_observations.py,sha256=
|
|
49
|
-
ert/config/_read_summary.py,sha256=
|
|
48
|
+
ert/config/_observations.py,sha256=txqNQ29BOh59i_mMlNDDuvmPnEHdD2vskv4j5AHlM6Q,15793
|
|
49
|
+
ert/config/_read_summary.py,sha256=4gA2qyofCNQGyOPIDHfOrBUadrmIKimZ9MK2W20ynko,7590
|
|
50
50
|
ert/config/_str_to_bool.py,sha256=AxNCJAuTtKF-562CRh7HgjQIyM7N-jjSlRJKvpCNk9I,852
|
|
51
51
|
ert/config/analysis_config.py,sha256=v-ZppIlP_NkmhtuYuxm31m2V3eA7YjvC3rDsMXm5qPk,8646
|
|
52
52
|
ert/config/analysis_module.py,sha256=TLluRobz_0NNMDSGFdM4L2t9agfvHyhoN-b1Rg8MAE4,2070
|
|
@@ -54,7 +54,7 @@ ert/config/capture_validation.py,sha256=8HGEbJ2z9FXeEaxSewejP7NtEh4LLomPwcdpC0CJ
|
|
|
54
54
|
ert/config/design_matrix.py,sha256=yyAFBppTwZXt4OeN6kxRmLk16jF8bntQWLHU_-rDQn4,17236
|
|
55
55
|
ert/config/distribution.py,sha256=rzpO-U8c2ptsj1KlfUw6n_CRaj-e1cvzVvasR0t5sZI,12728
|
|
56
56
|
ert/config/ensemble_config.py,sha256=b0KuQ_y85kr4AOPPX_qieYKgnDGZ4_87bSjYpVZuOlM,7322
|
|
57
|
-
ert/config/ert_config.py,sha256=
|
|
57
|
+
ert/config/ert_config.py,sha256=oToFsxaxdrpljdYWqHDW9-yaQnuSQ4kq5uDIR-dWsdk,55353
|
|
58
58
|
ert/config/ert_plugin.py,sha256=hENwrc9FfhqUYjVpFYcmy66jDLgU_gagOJFBcYjxe6A,458
|
|
59
59
|
ert/config/ert_script.py,sha256=64FZ-dMI8DZtRLHWReC19KY-ZOsBhdgYkwAe9ZWLc_I,8405
|
|
60
60
|
ert/config/everest_control.py,sha256=-bwFEb_GpdodQ3N_BscQdcKatMlWBs8UVSCDURV8Q3s,8072
|
|
@@ -67,13 +67,14 @@ ert/config/gen_kw_config.py,sha256=_fboMvCjtk5CChSl-4A5LN3YNII5y9jiK1YLSHj_48M,1
|
|
|
67
67
|
ert/config/known_response_types.py,sha256=aIlO4ox21-cmsigAJUbQwbkHjfpppQ_CDYzbl5jN9q0,454
|
|
68
68
|
ert/config/lint_file.py,sha256=DZv2j2OzhArtr7oDDUin6lJRwP6Ww620b7Yh-0SHUFc,671
|
|
69
69
|
ert/config/model_config.py,sha256=puFBesPfksWM9Yp1qKa1gu_y7r2drZf9etJUBqGspu4,5056
|
|
70
|
+
ert/config/observation_config_migrations.py,sha256=cYdhSjbEAM4mCQD2LTRvfPbc9orTQzeyZqE3YPDFDIs,27006
|
|
70
71
|
ert/config/parameter_config.py,sha256=9bXooLk9UIXPrqVhZN8Q42-3bxkyDh1Wxf2YjrzmaB8,5038
|
|
71
72
|
ert/config/parse_arg_types_list.py,sha256=Z0dy6c7mpkkZCMHXhR3KWpQJx8bboDFiKQUTevMcsVs,917
|
|
72
73
|
ert/config/queue_config.py,sha256=PF0TNcdzoWVLWU0Nwd5lV3RipS9bUAZxwmDyqEgJGBg,19630
|
|
73
74
|
ert/config/refcase.py,sha256=hTTJ87wYTVqlwkIf1vyjxnnvIiZ-msDfhT-_OxE-yjE,1555
|
|
74
75
|
ert/config/response_config.py,sha256=40cDJyxwNnPzkVfjyq4MtCIe0PrnXxZm577omBM7Fu8,2305
|
|
75
76
|
ert/config/responses_index.py,sha256=ewBOFRkus6LMg3GYao53KI4-6T2Gr6IJ1OhWOaiRP_c,1437
|
|
76
|
-
ert/config/rft_config.py,sha256=
|
|
77
|
+
ert/config/rft_config.py,sha256=Z_dGFBUmIBICaBmRyLPf4vl1-Gl8RyaesnJeEz06IzU,10141
|
|
77
78
|
ert/config/summary_config.py,sha256=T0NPZQ0GX0ZLJL_dMVEZl2taRf-HQH7zhGO7tPBIo3w,3980
|
|
78
79
|
ert/config/surface_config.py,sha256=6UlNsrVhSznFzK08M64ru70wZoq_WQZE7Iz19tQz7cg,10316
|
|
79
80
|
ert/config/workflow.py,sha256=WqEzT5YtXj0v6Quzqn0VP7fKTPUSpAgnKtgxoE8hL24,3569
|
|
@@ -116,22 +117,19 @@ ert/dark_storage/security.py,sha256=-rKpL0yPvsPiKs-SsMgZ4JQE87vgS1DE6BIQi43L79I,
|
|
|
116
117
|
ert/dark_storage/client/__init__.py,sha256=wygW0TqMVtKC6oScJkbqa8XqLO_RFUr8HODUDY6XR2k,122
|
|
117
118
|
ert/dark_storage/client/_session.py,sha256=1oWlBfXb952zShsn2KjSlugGoyyY9Ur3RIUyVDgqK1Q,2033
|
|
118
119
|
ert/dark_storage/client/client.py,sha256=Ia4r5-NrJx0fRdaJNNe7UVlDjW_C33DjPpnSBxP7-ag,1140
|
|
119
|
-
ert/dark_storage/compute/
|
|
120
|
-
ert/dark_storage/
|
|
121
|
-
ert/dark_storage/endpoints/__init__.py,sha256=o093-GLgw8br7PDKhHna0LviXeJQdC5P1RoIW2xlLqs,895
|
|
120
|
+
ert/dark_storage/compute/misfits.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
121
|
+
ert/dark_storage/endpoints/__init__.py,sha256=Vm-NFAKWx8xFYTmo3xkQDbo-50uNH8TFzXg-E7Lpg2o,803
|
|
122
122
|
ert/dark_storage/endpoints/ensembles.py,sha256=22M358HTAjiNuKaRYp9FZ3SZvkWL3v9wMDD0DGwLF8M,1363
|
|
123
123
|
ert/dark_storage/endpoints/experiment_server.py,sha256=snaCwRXayGn6_SIqH49Qmi4u1ZILiH2ynFZL6L4YsxQ,14118
|
|
124
|
-
ert/dark_storage/endpoints/experiments.py,sha256=
|
|
124
|
+
ert/dark_storage/endpoints/experiments.py,sha256=fpp4H892IIyj_cJY45DmaAKFk_ror6uk5ERmJ-tXza8,3269
|
|
125
125
|
ert/dark_storage/endpoints/observations.py,sha256=gnww5S1B9G8vAw7AwcR1fgW_vFgyf5WlU1gOSUXW1i4,4841
|
|
126
126
|
ert/dark_storage/endpoints/parameters.py,sha256=LERil7H-L3ZsPGGFm97kvy3XeIqpceyBe5aSFLkSVEY,4406
|
|
127
127
|
ert/dark_storage/endpoints/responses.py,sha256=tFEdgqP1vcOuRPmr4YpE9okEpxowXMoYjYdUq2wljZ8,6195
|
|
128
128
|
ert/dark_storage/endpoints/updates.py,sha256=BWEh2XUTqdsPPEtiSE8bJtXcFVzw-GlbKIK3vvc_Cu8,142
|
|
129
129
|
ert/dark_storage/endpoints/version.py,sha256=sEgwRIgPGJHztacjhbQKT3btiEQCe9PPQghZAtlZhh0,364
|
|
130
|
-
ert/dark_storage/endpoints/compute/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
131
|
-
ert/dark_storage/endpoints/compute/misfits.py,sha256=x7NuTdgd5s2_qdgcD73FjWEgsZRHAbgTUJ5BnXpd2aA,2877
|
|
132
130
|
ert/dark_storage/json_schema/__init__.py,sha256=1xcKlKmoCWmuwh0LzvRbDFycSi-UkWfFom4xjjVkSzI,328
|
|
133
131
|
ert/dark_storage/json_schema/ensemble.py,sha256=0hUr851q3rL8lRro-6me1gqjxsVhZR_UV81b3NLlJSU,573
|
|
134
|
-
ert/dark_storage/json_schema/experiment.py,sha256=
|
|
132
|
+
ert/dark_storage/json_schema/experiment.py,sha256=_E2E5pE-8tZFzU-QVSEP-7sXHr3ScRehk2oKWAkc4rQ,654
|
|
135
133
|
ert/dark_storage/json_schema/observation.py,sha256=7BG4lB1vqeBz74QKEySuN50eWgepBd-ak9phDLp6jjY,990
|
|
136
134
|
ert/dark_storage/json_schema/prior.py,sha256=gq-EsvMoQPx2Cjq8g4hf9ML2QOkcTgFfyVXhlAdtyp0,2815
|
|
137
135
|
ert/dark_storage/json_schema/record.py,sha256=gr_qsEEZLfiSut3zHnHmZzbKXLRDnm8LxVMV7934gxE,367
|
|
@@ -151,14 +149,14 @@ ert/exceptions/_exceptions.py,sha256=dv4rs5oWe00PcelvGEsTscD3AKhI1uwwSjprMSHk4xw
|
|
|
151
149
|
ert/field_utils/__init__.py,sha256=bnjVYQq0A1lkTUSDUHU8pBtnkQmvdw-zrtFhUT41FW4,768
|
|
152
150
|
ert/field_utils/field_file_format.py,sha256=QWDQYsba2zUfbMltBxReZqAZOYWkHb8kG_xY7BvBzO0,297
|
|
153
151
|
ert/field_utils/field_utils.py,sha256=Z6mbMHLNyCPdPDyD01Z_myLXfiki3j9MkT08S4awVuk,16791
|
|
154
|
-
ert/field_utils/grdecl_io.py,sha256=
|
|
152
|
+
ert/field_utils/grdecl_io.py,sha256=kgSE3Fyr_7KDS1HQRmO7RQLMwgrkgJ_Tsmo7jE9GE1s,8971
|
|
155
153
|
ert/field_utils/roff_io.py,sha256=m4RX2134kVbEkuPjIY5OthavRe4kNirtL4jNdEf_xpU,4014
|
|
156
154
|
ert/gui/__init__.py,sha256=Q-BjtVNAk8Kw2hcPMlCkbTOSjNZPzSX5xl0tFUUI2bY,689
|
|
157
155
|
ert/gui/about_dialog.py,sha256=H0Jfso2v9s1eONTVgghH84UcaUlwVs0Cqqbv17Hvw4g,3127
|
|
158
156
|
ert/gui/ertnotifier.py,sha256=4ZFXOrk2ATr5Dq-WW-0s_wokfKHIUgrBn3Y6cfb3JlM,3030
|
|
159
157
|
ert/gui/find_ert_info.py,sha256=hwqiCa5rDZEL_25QVsx920d9NOaVM2PyUor89_-70-Q,301
|
|
160
158
|
ert/gui/main.py,sha256=dsT2AAPFgSEGLlsHiaEwALCdJNt2OcUe11TkdB7WU-g,10123
|
|
161
|
-
ert/gui/main_window.py,sha256=
|
|
159
|
+
ert/gui/main_window.py,sha256=T-Vpai6vslMjEWMdG-iyjBT7pIfXpNS6dY4PffaRICw,14889
|
|
162
160
|
ert/gui/summarypanel.py,sha256=pIMCUyEulNB-TzC1d6NBSUv4dzmM3RzDKiDRc6HuUe4,4832
|
|
163
161
|
ert/gui/ertwidgets/__init__.py,sha256=LtwHe4wpA0YpbealTrukMb7rDSSTxSyGkVaM8IvlI8A,1878
|
|
164
162
|
ert/gui/ertwidgets/analysismoduleedit.py,sha256=Ff9gzaQHrEH1yQ2tWg15fZrUN0mr_rJEUMciatOjlLc,1444
|
|
@@ -261,19 +259,19 @@ ert/gui/tools/load_results/__init__.py,sha256=P6mSptsply70br8pzTW6PsUE4OwtPMntLh
|
|
|
261
259
|
ert/gui/tools/load_results/load_results_panel.py,sha256=e7SxQDypviYx-RUlROmkHJ7I7kaiI9SRS8dGN5HVUF0,5884
|
|
262
260
|
ert/gui/tools/load_results/load_results_tool.py,sha256=deP__dGX8z5iycPMYv3cYyOtag6urjAvX4ZXq0TZUN8,2290
|
|
263
261
|
ert/gui/tools/manage_experiments/__init__.py,sha256=MAB41GPqlpALPYRvFFpKCcr2Sz3cya7Grd88jLxUj2A,99
|
|
264
|
-
ert/gui/tools/manage_experiments/export_dialog.py,sha256=
|
|
262
|
+
ert/gui/tools/manage_experiments/export_dialog.py,sha256=D-kCCm7aW3UXIZxETOe49VLoqMQ8KW4dMdBqq8wPtfI,4609
|
|
265
263
|
ert/gui/tools/manage_experiments/manage_experiments_panel.py,sha256=EUGOo68g8E9f4oG3K4MFRCu8a7rm7ojOF6jUvz_dqic,5680
|
|
266
|
-
ert/gui/tools/manage_experiments/storage_info_widget.py,sha256=
|
|
264
|
+
ert/gui/tools/manage_experiments/storage_info_widget.py,sha256=LodyZIqm0qMqZgpM-_lyedqYXJCWgQonqnqTmoXVTWI,19791
|
|
267
265
|
ert/gui/tools/manage_experiments/storage_model.py,sha256=wf5JPqvbFWLI9ZcVTc4gpZh3hUPDNwOxRdbdcRtjKCc,6802
|
|
268
266
|
ert/gui/tools/manage_experiments/storage_widget.py,sha256=pe5mWOgw-uNGXaZYhl1JsF5--Krz1W4n3Ut4sRcx6uc,6692
|
|
269
267
|
ert/gui/tools/plot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
270
268
|
ert/gui/tools/plot/data_type_keys_list_model.py,sha256=HkPeD_tke-iGFh9LPz5Aux-A0syRRFk1k_luLCbOgi4,2203
|
|
271
269
|
ert/gui/tools/plot/data_type_keys_widget.py,sha256=AgJh_7vfXFKzzzCMq8pxhldkzuhBtfaVyZXEcQYDjG0,4222
|
|
272
270
|
ert/gui/tools/plot/data_type_proxy_model.py,sha256=DGj7GsDwbvr2OUIudmQpdnoqtPeWyKVJHlctxl1TzzQ,2176
|
|
273
|
-
ert/gui/tools/plot/plot_api.py,sha256=
|
|
271
|
+
ert/gui/tools/plot/plot_api.py,sha256=KnQVqat4MD1munLJNvnROlR1B_y2zo0jRg3FJCSpMho,16365
|
|
274
272
|
ert/gui/tools/plot/plot_ensemble_selection_widget.py,sha256=WnXsI5SwIklPvlkJ_02qjv6T8pDhXVStiHqerD53u_4,7619
|
|
275
|
-
ert/gui/tools/plot/plot_widget.py,sha256=
|
|
276
|
-
ert/gui/tools/plot/plot_window.py,sha256=
|
|
273
|
+
ert/gui/tools/plot/plot_widget.py,sha256=GYCQFtNnfHf42NauQ73H7kBPVVjVmuQQHTe0QbdD54Q,7800
|
|
274
|
+
ert/gui/tools/plot/plot_window.py,sha256=4zzUUGF4HXfx8Xka8NjzG1Hi8VJNyUJXhuYl8gs--Cc,17313
|
|
277
275
|
ert/gui/tools/plot/customize/__init__.py,sha256=spAW99ubzOmWuScii_idW0frGDttKCcT4XQegF3vOSU,151
|
|
278
276
|
ert/gui/tools/plot/customize/color_chooser.py,sha256=fxrXEFCCvHwJnE0pQMELIy0torqSNATnARx6hBgSV5E,2576
|
|
279
277
|
ert/gui/tools/plot/customize/customization_view.py,sha256=er1PQnhePTs43dsB9gDV7nkMDV0tDmqFneHG7R5UDkM,5093
|
|
@@ -390,14 +388,12 @@ ert/scheduler/lsf_driver.py,sha256=mT42-OSljFfSAO5AsUm4CVUstxRDpWV776SK9f41lSI,2
|
|
|
390
388
|
ert/scheduler/openpbs_driver.py,sha256=LQhvmU-EVcMwgBolbKbMptzT4LLhLkYyjfDtzU7XIrw,14143
|
|
391
389
|
ert/scheduler/scheduler.py,sha256=7GvodjkCQrAzVHGu8JKRSd913zKyAeqC_EarsVj0CA0,16106
|
|
392
390
|
ert/scheduler/slurm_driver.py,sha256=xL8vb-jSLwjXYJrGZEJ9RozDdevh2KGNLuDxLiTz_AA,18054
|
|
393
|
-
ert/services/__init__.py,sha256=
|
|
394
|
-
ert/services/
|
|
395
|
-
ert/services/
|
|
396
|
-
ert/services/ert_server.py,sha256=qIzqugIHcxwKuzjkItiMt3jah3hNI7x3NQ3p_WBBf_o,10768
|
|
397
|
-
ert/services/webviz_ert_service.py,sha256=J5vznqb_-DjlDMOze7tdvuBE4GWEPgJ5dIIXvRLKd0Y,650
|
|
391
|
+
ert/services/__init__.py,sha256=ac2DdYRfxEwIAI4Z3nL1RZHJdN0YReUGds2hEovrPIw,198
|
|
392
|
+
ert/services/_storage_main.py,sha256=dVMAzHs8MJZR3N8EOAwm5LvnzvlXIE-L6p-1rBGIYZA,11778
|
|
393
|
+
ert/services/ert_server.py,sha256=SNIIYyF9xwBj7o6aqL4aR-nMAUFAVqIMfa0ZddXaVZg,15645
|
|
398
394
|
ert/shared/__init__.py,sha256=OwgL-31MxA0fabETJ5Svw0tqJpHi569CZDRFHdHiqA0,644
|
|
399
395
|
ert/shared/net_utils.py,sha256=Wp9Qyd5wWNHPU0Myh1GCbUONu0a-akYEdJ07MjQJt4I,6130
|
|
400
|
-
ert/shared/version.py,sha256=
|
|
396
|
+
ert/shared/version.py,sha256=lwpP6zUTvg5xbaGaRTDRFy-iEE3-9Zue4Wvd9oBQUmg,724
|
|
401
397
|
ert/shared/_doc_utils/__init__.py,sha256=09KMJxjza26BXouUy6yJmMiSuYFGSI6c8nZ-1_qXh90,995
|
|
402
398
|
ert/shared/_doc_utils/ert_jobs.py,sha256=uHP8ozhKwCHG6BkyhAgCGoy59JEFb102pHKot-5ZEys,8054
|
|
403
399
|
ert/shared/_doc_utils/everest_jobs.py,sha256=uBDN7tIwlBJIZVZ6ZFL1tkewEJJGDLoeVrFIIrJznvM,2081
|
|
@@ -409,14 +405,12 @@ ert/shared/share/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
|
|
|
409
405
|
ert/shared/status/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
410
406
|
ert/shared/status/utils.py,sha256=RrCutWwpzSEyKRNxby1bSzOhyr6uKGeKPDFjEQzMeME,1293
|
|
411
407
|
ert/shared/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
412
|
-
ert/shared/storage/command.py,sha256=fksba9v75M2QajD_n0waus9NgT9jy1m5svmmjVOhXbk,1087
|
|
413
408
|
ert/shared/storage/connection.py,sha256=Y5P8B8B__j3doE9UE-1QROFYwrLcrmFcG80LhGTdg58,396
|
|
414
|
-
ert/shared/storage/extraction.py,sha256=52Nyh2SITXIglEBMIRcW2a_iqJL3OdAf_dWMY0plTZE,1307
|
|
415
409
|
ert/storage/__init__.py,sha256=f4uzzomaB1TpFpzGMF2Jd_PV54lq4EfkiZzQApDBuPQ,2110
|
|
416
410
|
ert/storage/load_status.py,sha256=7h_GdA2qYGgQ-M5AOIo7xG43ljwzEEgbRb7vg0xSYEE,304
|
|
417
|
-
ert/storage/local_ensemble.py,sha256=
|
|
418
|
-
ert/storage/local_experiment.py,sha256=
|
|
419
|
-
ert/storage/local_storage.py,sha256=
|
|
411
|
+
ert/storage/local_ensemble.py,sha256=cJgExjRsK_VpLDxMrfX7HmCwXxLuGpth_mVhSZS0F4Y,47676
|
|
412
|
+
ert/storage/local_experiment.py,sha256=bzYAsalnAFymxDRfjnC8kb0Cg9P-wnkqLKLcoM-c3zM,16470
|
|
413
|
+
ert/storage/local_storage.py,sha256=ihrzfMjBfCUvJFOLUISHbrVf7d-Y0CFktMyM_jZ9LLE,24059
|
|
420
414
|
ert/storage/mode.py,sha256=GJBlRSqS0Q06qDvaAztdcG-oV2MLsVID2Mo3OgQKjUw,2470
|
|
421
415
|
ert/storage/realization_storage_state.py,sha256=JdiBr__Ce5e1MzmRsRdMuwgCtiuHZRjsQ-as8ivTX7Q,220
|
|
422
416
|
ert/storage/migration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -433,12 +427,11 @@ ert/storage/migration/to19.py,sha256=1FmfNeXBW149W07u78AyU39g57TXXNl-fG9c4kqlIpU
|
|
|
433
427
|
ert/storage/migration/to20.py,sha256=DZ79hfJxdbaewP4W8TyRdsQvi-FkeSco_0uZKBdyD_4,697
|
|
434
428
|
ert/storage/migration/to21.py,sha256=ArUePLN6placVlgKFS2Fi1kWD4qQZ1bsJGOxYMmhCP0,811
|
|
435
429
|
ert/storage/migration/to22.py,sha256=UxPy5i5o0UzNk9chY024PmwbHMdJCXCngmsquG_yGkI,622
|
|
436
|
-
ert/storage/migration/to23.py,sha256=ynhYCm1yZEUvCmJpSBNrElzpGLOKpb29IjSe-Dd8azg,1740
|
|
437
430
|
ert/storage/migration/to6.py,sha256=Pj9lVCyPCOP0-dt4uypsZtS5Awbc8B7oaySu_VTwnnA,1514
|
|
438
431
|
ert/storage/migration/to7.py,sha256=hV5lLfaQegyvxsy_lWfsiQAYVPCvS8Oe0fYc_fvKXzY,4500
|
|
439
432
|
ert/storage/migration/to8.py,sha256=VL7A5KWTSFhBWmx3n-vCKBaEd2U8SUqyz8vPieyVd9E,5390
|
|
440
433
|
ert/storage/migration/to9.py,sha256=0YMcFH1__SijLLTL6qluhE21bKRvMbuOsafVm6xeSM0,3310
|
|
441
|
-
ert/utils/__init__.py,sha256=
|
|
434
|
+
ert/utils/__init__.py,sha256=pvElfU1gixK6x3gb2ZPDdZUTaDXrB8AKhfa0Z2dmGOg,1544
|
|
442
435
|
ert/validation/__init__.py,sha256=tIo-USPe7W2v0qKWKZm1LqyXMcCtFFkjJovQFWQFup8,1176
|
|
443
436
|
ert/validation/active_range.py,sha256=7ActPaKpoZmFKSNCqSjimsmKxAS60tRBqDP8_sMoOFU,3256
|
|
444
437
|
ert/validation/argument_definition.py,sha256=XCXhUTRvxczzHLQV0HCgxxSU1ZxXuuoi-q8BdJIrs-0,561
|
|
@@ -455,7 +448,7 @@ ert/validation/validation_status.py,sha256=f47_B7aS-9DEh6uaVzKxD97pXienkyTVVCqTy
|
|
|
455
448
|
ert/warnings/__init__.py,sha256=IBwQVkdD7Njaad9PAB-9K-kr15wnA4EBKboxyqgu9NA,214
|
|
456
449
|
ert/warnings/_warnings.py,sha256=7qhNZ0W4nnljzoOx6AXX7VlMv5pa34Ek5M5n1Ep0Kak,189
|
|
457
450
|
ert/warnings/specific_warning_handler.py,sha256=5dVXtOhzcMmtPBGx4AOddXNPfzTFOPA7RVtdH8hLv68,932
|
|
458
|
-
ert-19.0.
|
|
451
|
+
ert-19.0.0rc1.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
|
|
459
452
|
everest/__init__.py,sha256=8_f50f6H3-onqaiuNCwC0Eiotdl9JuTxhwyF_54MVvU,306
|
|
460
453
|
everest/config_file_loader.py,sha256=rOHYvB4ayB2MaKdaAynvJVtbCOqi_z25EdwEqJ02-DQ,5675
|
|
461
454
|
everest/everest_storage.py,sha256=c3sgU7-3BDSRXxJfCR_4F58rWEaoII1wygz6VvM-GGI,42025
|
|
@@ -466,12 +459,12 @@ everest/assets/everest_logo.svg,sha256=1GDy-tJYQSean8f_WWTlcKPhv1Wsb_xhFzXe3Gguk
|
|
|
466
459
|
everest/bin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
467
460
|
everest/bin/config_branch_script.py,sha256=-xMKskcDf5hxlzTtcyNG55yvnUKPQTtoUetlEGss6KM,5063
|
|
468
461
|
everest/bin/everconfigdump_script.py,sha256=MKzJZiE14RhuNGf4OUhjygxR25VzLfQtR8I4DViG8CU,821
|
|
469
|
-
everest/bin/everest_script.py,sha256=
|
|
462
|
+
everest/bin/everest_script.py,sha256=qNYTSMMo4a9at7gceV1mA-KflgwHFskgWseguwownmE,9698
|
|
470
463
|
everest/bin/everlint_script.py,sha256=-tPenYSSMfyf1Tk8FNxcQRKzVSkeLHI_oYJg2mntjZw,1202
|
|
471
|
-
everest/bin/kill_script.py,sha256=
|
|
464
|
+
everest/bin/kill_script.py,sha256=ywjEkBjz2-30YRkNb88_4SL_234PKUQGgrd3sVbbaok,3211
|
|
472
465
|
everest/bin/main.py,sha256=eJhcM_cJHieWDs6f3R0IjKfw9VWoI9ZnkyLpic01pi4,3352
|
|
473
|
-
everest/bin/monitor_script.py,sha256=
|
|
474
|
-
everest/bin/utils.py,sha256=
|
|
466
|
+
everest/bin/monitor_script.py,sha256=2DlYyLKAITR28BVj1WDBOiSFU3icZB57_QzrjM8klN4,4477
|
|
467
|
+
everest/bin/utils.py,sha256=L_XgOxGWCS0j8hdQdBt6CQvm_CLi46Hr7IPrdeaq6t0,18872
|
|
475
468
|
everest/bin/visualization_script.py,sha256=k73iFgh6uZTWoFjMcsjqVg_Ni2qztL09XWWg554760A,2497
|
|
476
469
|
everest/config/__init__.py,sha256=nYC7D8A0Lh8jFIbtCiLjRxSjufPCsQsdQ6HW5dZfHfc,1535
|
|
477
470
|
everest/config/control_config.py,sha256=B-HToLIbeIAT9ye49_R6TpbcpSw1cc7q38cJCBQriJw,13584
|
|
@@ -497,11 +490,11 @@ everest/config/well_config.py,sha256=EbpqyxVhLhb0aGSgL5k4t03VMHv0riaaX2anVrF8W1M
|
|
|
497
490
|
everest/config/workflow_config.py,sha256=sUWJPNouDBr5g_sTL4g3rs5SluC7TdXLP2kMCYILNFc,812
|
|
498
491
|
everest/detached/__init__.py,sha256=d9U1Mjl-zAb_wIOnlLiYa6nPzN8SVldJlLe5neWeCIs,431
|
|
499
492
|
everest/detached/client.py,sha256=MSDv000zA54x25uyNKgvv6mAsIXbGS_-Q7FbXdBt_Y0,8707
|
|
500
|
-
everest/detached/everserver.py,sha256=
|
|
493
|
+
everest/detached/everserver.py,sha256=vuofusGYwL__s1Cye8ZmL4-WAg2moL_WmYucHDHpnfo,6196
|
|
501
494
|
everest/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
502
495
|
everest/gui/everest_client.py,sha256=sNuilf3WqfjY_7tv1694bZd5mozhj3-3iy0DxtGpF4A,5633
|
|
503
496
|
everest/gui/main.py,sha256=tdaIf2uJT3Uveao4cqv1tUcjto1Kf8Lbx6SLDsFA2GA,1241
|
|
504
|
-
everest/gui/main_window.py,sha256=
|
|
497
|
+
everest/gui/main_window.py,sha256=eaIi8Q_MZsuECEkAv-mPK1iN3yOyky31aROef3hXUuI,2795
|
|
505
498
|
everest/optimizer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
506
499
|
everest/optimizer/everest2ropt.py,sha256=evVvZEC_5l8zouWInpQSHkJd1TK0c0kadtwVUZ4tJUY,13087
|
|
507
500
|
everest/optimizer/opt_model_transforms.py,sha256=3q0gp11MrVV_jwPh4gpJsixxWIZ0u4nnQH7PC7dYK4k,19271
|
|
@@ -517,10 +510,10 @@ everest/templates/slot_delay.tmpl,sha256=VCWyl3JruIrkke2NPGGwKGqDMvkyDGCAZU_NyDZ
|
|
|
517
510
|
everest/templates/well_delay.tmpl,sha256=6_rXMcuV53CMEWd9CZuPL01_6f1diAHDktPg-GevH7s,131
|
|
518
511
|
everest/templates/well_drill.tmpl,sha256=9iLexmBHMsMQNXyyRK4GlmVuVpVIxRcCHpy1av57_qE,94
|
|
519
512
|
everest/templates/well_order.tmpl,sha256=XJ1eVRkeyTdLu5sLsltJSSK6BDLN7rFOAqLdM3ZZy3w,75
|
|
520
|
-
everest/util/__init__.py,sha256=
|
|
513
|
+
everest/util/__init__.py,sha256=84RowTXhOiElFo6izQ2iRyvlRUemFyr8cWq_Q2smKvU,744
|
|
521
514
|
everest/util/forward_models.py,sha256=JPxHhLI6TrmQJwW50wwGBmw57TfRd8SG2svYhXFHrc8,1617
|
|
522
|
-
ert-19.0.
|
|
523
|
-
ert-19.0.
|
|
524
|
-
ert-19.0.
|
|
525
|
-
ert-19.0.
|
|
526
|
-
ert-19.0.
|
|
515
|
+
ert-19.0.0rc1.dist-info/METADATA,sha256=oMn7q2oJQr6uBNCujfF8qmailZCIQh_enb50Yumc-rs,10016
|
|
516
|
+
ert-19.0.0rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
517
|
+
ert-19.0.0rc1.dist-info/entry_points.txt,sha256=ChZ7vn8Qy9v9rT8GM2JtAvWDN3NVoy4BIcvVRtU73CM,189
|
|
518
|
+
ert-19.0.0rc1.dist-info/top_level.txt,sha256=LRh9GfdfyDWfAGmrQgp_XdoMHA4v6aotw8xgsy5YyHE,17
|
|
519
|
+
ert-19.0.0rc1.dist-info/RECORD,,
|
everest/bin/everest_script.py
CHANGED
|
@@ -14,8 +14,9 @@ import anyio
|
|
|
14
14
|
|
|
15
15
|
from _ert.threading import ErtThread
|
|
16
16
|
from ert.config import QueueSystem
|
|
17
|
-
from ert.services import
|
|
17
|
+
from ert.services import create_ertserver_client
|
|
18
18
|
from ert.storage.local_experiment import ExperimentState
|
|
19
|
+
from ert.utils import makedirs_if_needed
|
|
19
20
|
from everest.config import EverestConfig, ServerConfig
|
|
20
21
|
from everest.detached import (
|
|
21
22
|
start_experiment,
|
|
@@ -24,7 +25,6 @@ from everest.detached import (
|
|
|
24
25
|
)
|
|
25
26
|
from everest.everest_storage import EverestStorage
|
|
26
27
|
from everest.util import (
|
|
27
|
-
makedirs_if_needed,
|
|
28
28
|
version_info,
|
|
29
29
|
warn_user_that_runpath_is_nonempty,
|
|
30
30
|
)
|
|
@@ -48,7 +48,7 @@ def everest_entry(args: list[str] | None = None) -> None:
|
|
|
48
48
|
|
|
49
49
|
options = parser.parse_args(args)
|
|
50
50
|
|
|
51
|
-
makedirs_if_needed(options.config.output_dir, roll_if_exists=True)
|
|
51
|
+
makedirs_if_needed(Path(options.config.output_dir), roll_if_exists=True)
|
|
52
52
|
with setup_logging(options):
|
|
53
53
|
logger.info(version_info())
|
|
54
54
|
|
|
@@ -169,7 +169,7 @@ async def run_everest(options: argparse.Namespace) -> None:
|
|
|
169
169
|
)
|
|
170
170
|
|
|
171
171
|
try:
|
|
172
|
-
|
|
172
|
+
create_ertserver_client(
|
|
173
173
|
Path(ServerConfig.get_session_dir(options.config.output_dir)), timeout=1
|
|
174
174
|
)
|
|
175
175
|
server_running = True
|
|
@@ -233,7 +233,7 @@ async def run_everest(options: argparse.Namespace) -> None:
|
|
|
233
233
|
|
|
234
234
|
print("Waiting for server ...")
|
|
235
235
|
logger.debug("Waiting for response from everserver")
|
|
236
|
-
client =
|
|
236
|
+
client = create_ertserver_client(
|
|
237
237
|
Path(ServerConfig.get_session_dir(options.config.output_dir))
|
|
238
238
|
)
|
|
239
239
|
wait_for_server(client, timeout=600)
|
everest/bin/kill_script.py
CHANGED
|
@@ -12,7 +12,7 @@ from functools import partial
|
|
|
12
12
|
from pathlib import Path
|
|
13
13
|
from typing import Any
|
|
14
14
|
|
|
15
|
-
from ert.services import
|
|
15
|
+
from ert.services import create_ertserver_client
|
|
16
16
|
from everest.bin.utils import setup_logging
|
|
17
17
|
from everest.config import EverestConfig, ServerConfig
|
|
18
18
|
from everest.detached import stop_server, wait_for_server_to_stop
|
|
@@ -74,7 +74,7 @@ def _handle_keyboard_interrupt(signal: int, _: Any, after: bool = False) -> None
|
|
|
74
74
|
|
|
75
75
|
def kill_everest(options: argparse.Namespace) -> None:
|
|
76
76
|
try:
|
|
77
|
-
client =
|
|
77
|
+
client = create_ertserver_client(
|
|
78
78
|
Path(ServerConfig.get_session_dir(options.config.output_dir)), timeout=1
|
|
79
79
|
)
|
|
80
80
|
server_context = ServerConfig.get_server_context_from_conn_info(
|
everest/bin/monitor_script.py
CHANGED
|
@@ -7,7 +7,7 @@ from functools import partial
|
|
|
7
7
|
from pathlib import Path
|
|
8
8
|
from textwrap import dedent
|
|
9
9
|
|
|
10
|
-
from ert.services import
|
|
10
|
+
from ert.services import create_ertserver_client
|
|
11
11
|
from ert.storage import ErtStorageException, ExperimentState
|
|
12
12
|
from everest.config import EverestConfig, ServerConfig
|
|
13
13
|
from everest.everest_storage import EverestStorage
|
|
@@ -82,7 +82,7 @@ def _build_args_parser() -> argparse.ArgumentParser:
|
|
|
82
82
|
def monitor_everest(options: argparse.Namespace) -> None:
|
|
83
83
|
config: EverestConfig = options.config
|
|
84
84
|
try:
|
|
85
|
-
with
|
|
85
|
+
with create_ertserver_client(
|
|
86
86
|
Path(ServerConfig.get_session_dir(config.output_dir)), timeout=1
|
|
87
87
|
) as client:
|
|
88
88
|
server_context = ServerConfig.get_server_context_from_conn_info(
|
everest/bin/utils.py
CHANGED
|
@@ -26,11 +26,12 @@ from ert.ensemble_evaluator import (
|
|
|
26
26
|
from ert.ensemble_evaluator.event import EndEvent
|
|
27
27
|
from ert.logging import LOGGING_CONFIG
|
|
28
28
|
from ert.plugins.plugin_manager import ErtPluginManager
|
|
29
|
-
from ert.services import
|
|
29
|
+
from ert.services import create_ertserver_client
|
|
30
30
|
from ert.storage import (
|
|
31
31
|
ExperimentStatus,
|
|
32
32
|
open_storage,
|
|
33
33
|
)
|
|
34
|
+
from ert.utils import makedirs_if_needed
|
|
34
35
|
from everest.config import EverestConfig
|
|
35
36
|
from everest.config.server_config import ServerConfig
|
|
36
37
|
from everest.detached import (
|
|
@@ -40,7 +41,6 @@ from everest.detached import (
|
|
|
40
41
|
wait_for_server_to_stop,
|
|
41
42
|
)
|
|
42
43
|
from everest.strings import EVEREST, OPT_PROGRESS_ID, SIM_PROGRESS_ID
|
|
43
|
-
from everest.util import makedirs_if_needed
|
|
44
44
|
|
|
45
45
|
JOB_SUCCESS = "Finished"
|
|
46
46
|
JOB_RUNNING = "Running"
|
|
@@ -54,7 +54,7 @@ def cleanup_logging() -> None:
|
|
|
54
54
|
@contextmanager
|
|
55
55
|
def setup_logging(options: argparse.Namespace) -> Generator[None, None, None]:
|
|
56
56
|
if isinstance(options.config, EverestConfig):
|
|
57
|
-
makedirs_if_needed(options.config.output_dir, roll_if_exists=False)
|
|
57
|
+
makedirs_if_needed(Path(options.config.output_dir), roll_if_exists=False)
|
|
58
58
|
log_dir = Path(options.config.output_dir) / "logs"
|
|
59
59
|
else:
|
|
60
60
|
# `everest branch` gives a tuple object here.
|
|
@@ -106,7 +106,7 @@ def handle_keyboard_interrupt(signum: int, _: Any, options: argparse.Namespace)
|
|
|
106
106
|
"The optimization will be stopped and the program will exit..."
|
|
107
107
|
)
|
|
108
108
|
try:
|
|
109
|
-
client =
|
|
109
|
+
client = create_ertserver_client(
|
|
110
110
|
Path(ServerConfig.get_session_dir(options.config.output_dir))
|
|
111
111
|
)
|
|
112
112
|
server_context = ServerConfig.get_server_context_from_conn_info(
|
everest/detached/everserver.py
CHANGED
|
@@ -12,11 +12,11 @@ import yaml
|
|
|
12
12
|
from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
|
|
13
13
|
|
|
14
14
|
from ert.plugins.plugin_manager import ErtPluginManager
|
|
15
|
-
from ert.services import ErtServer
|
|
16
|
-
from ert.services._base_service import BaseServiceExit
|
|
15
|
+
from ert.services import ErtServer, ErtServerExit, create_ertserver_client
|
|
17
16
|
from ert.storage import ExperimentStatus
|
|
18
17
|
from ert.storage.local_experiment import ExperimentState
|
|
19
18
|
from ert.trace import tracer
|
|
19
|
+
from ert.utils import makedirs_if_needed
|
|
20
20
|
from everest.config import ServerConfig
|
|
21
21
|
from everest.strings import (
|
|
22
22
|
DEFAULT_LOGGING_FORMAT,
|
|
@@ -25,7 +25,7 @@ from everest.strings import (
|
|
|
25
25
|
EXPERIMENT_SERVER,
|
|
26
26
|
OPTIMIZATION_LOG_DIR,
|
|
27
27
|
)
|
|
28
|
-
from everest.util import
|
|
28
|
+
from everest.util import version_info
|
|
29
29
|
|
|
30
30
|
logger = logging.getLogger(__name__)
|
|
31
31
|
|
|
@@ -34,7 +34,7 @@ def _configure_loggers(
|
|
|
34
34
|
log_dir: Path, logging_level: int, output_file: str | None
|
|
35
35
|
) -> None:
|
|
36
36
|
def make_handler_config(path: Path, log_level: int) -> dict[str, Any]:
|
|
37
|
-
makedirs_if_needed(
|
|
37
|
+
makedirs_if_needed(path.parent)
|
|
38
38
|
return {
|
|
39
39
|
"class": "logging.FileHandler",
|
|
40
40
|
"formatter": "default",
|
|
@@ -166,7 +166,7 @@ def main() -> None:
|
|
|
166
166
|
timeout=240, project=Path(server_path), logging_config=log_file.name
|
|
167
167
|
) as server:
|
|
168
168
|
server.fetch_connection_info()
|
|
169
|
-
with
|
|
169
|
+
with create_ertserver_client(Path(server_path)) as client:
|
|
170
170
|
done = False
|
|
171
171
|
while not done:
|
|
172
172
|
response = client.get(
|
|
@@ -178,7 +178,7 @@ def main() -> None:
|
|
|
178
178
|
ExperimentState.running,
|
|
179
179
|
}
|
|
180
180
|
time.sleep(0.5)
|
|
181
|
-
except
|
|
181
|
+
except ErtServerExit:
|
|
182
182
|
# Server exit, happens on normal shutdown and keyboard interrupt
|
|
183
183
|
logging.getLogger(EVERSERVER).info("Everserver stopped by user")
|
|
184
184
|
except Exception as e:
|
everest/gui/main_window.py
CHANGED
|
@@ -13,7 +13,7 @@ from PyQt6.QtWidgets import (
|
|
|
13
13
|
from ert.gui.ertnotifier import ErtNotifier
|
|
14
14
|
from ert.gui.simulation.run_dialog import RunDialog
|
|
15
15
|
from ert.plugins import ErtPluginManager
|
|
16
|
-
from ert.services import
|
|
16
|
+
from ert.services import create_ertserver_client
|
|
17
17
|
from everest.config import ServerConfig
|
|
18
18
|
from everest.detached import wait_for_server
|
|
19
19
|
from everest.gui.everest_client import EverestClient
|
|
@@ -43,7 +43,7 @@ class EverestMainWindow(QMainWindow):
|
|
|
43
43
|
self.setCentralWidget(self.central_widget)
|
|
44
44
|
|
|
45
45
|
def run(self) -> None:
|
|
46
|
-
storage_client =
|
|
46
|
+
storage_client = create_ertserver_client(
|
|
47
47
|
Path(ServerConfig.get_session_dir(self.output_dir))
|
|
48
48
|
)
|
|
49
49
|
wait_for_server(storage_client, 60)
|
everest/util/__init__.py
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
1
|
import logging
|
|
2
|
-
import os
|
|
3
|
-
from datetime import UTC, datetime
|
|
4
2
|
|
|
5
3
|
from ropt.version import version as ropt_version
|
|
6
4
|
|
|
@@ -8,7 +6,7 @@ try:
|
|
|
8
6
|
from ert.shared.version import version as ert_version
|
|
9
7
|
except ImportError:
|
|
10
8
|
ert_version = "0.0.0"
|
|
11
|
-
|
|
9
|
+
|
|
12
10
|
from everest.strings import EVEREST
|
|
13
11
|
|
|
14
12
|
|
|
@@ -16,14 +14,6 @@ def version_info() -> str:
|
|
|
16
14
|
return f"everest:{ert_version}, ropt:{ropt_version}, ert:{ert_version}"
|
|
17
15
|
|
|
18
16
|
|
|
19
|
-
def makedirs_if_needed(path: str, roll_if_exists: bool = False) -> None:
|
|
20
|
-
if os.path.isdir(path):
|
|
21
|
-
if not roll_if_exists:
|
|
22
|
-
return
|
|
23
|
-
_roll_dir(path) # exists and should be rolled
|
|
24
|
-
os.makedirs(path)
|
|
25
|
-
|
|
26
|
-
|
|
27
17
|
def warn_user_that_runpath_is_nonempty() -> None:
|
|
28
18
|
print(
|
|
29
19
|
"Everest is running in an existing runpath.\n\n"
|
|
@@ -34,11 +24,3 @@ def warn_user_that_runpath_is_nonempty() -> None:
|
|
|
34
24
|
"be used if not configured correctly.\n"
|
|
35
25
|
)
|
|
36
26
|
logging.getLogger(EVEREST).warning("Everest is running in an existing runpath")
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
def _roll_dir(old_name: str) -> None:
|
|
40
|
-
old_name = os.path.realpath(old_name)
|
|
41
|
-
timestamp = file_safe_timestamp(datetime.now(UTC).isoformat())
|
|
42
|
-
new_name = f"{old_name}__{timestamp}"
|
|
43
|
-
os.rename(old_name, new_name)
|
|
44
|
-
logging.getLogger(EVEREST).info(f"renamed {old_name} to {new_name}")
|
|
File without changes
|
|
File without changes
|
|
@@ -1,95 +0,0 @@
|
|
|
1
|
-
import json
|
|
2
|
-
from datetime import datetime
|
|
3
|
-
from typing import Annotated, Any
|
|
4
|
-
from uuid import UUID
|
|
5
|
-
|
|
6
|
-
import pandas as pd
|
|
7
|
-
from dateutil.parser import parse
|
|
8
|
-
from fastapi import APIRouter, Depends, Query, status
|
|
9
|
-
from fastapi.responses import Response
|
|
10
|
-
|
|
11
|
-
from ert.dark_storage import exceptions as exc
|
|
12
|
-
from ert.dark_storage.common import get_storage
|
|
13
|
-
from ert.dark_storage.compute.misfits import calculate_signed_chi_squared_misfits
|
|
14
|
-
from ert.dark_storage.endpoints.observations import (
|
|
15
|
-
_get_observations,
|
|
16
|
-
)
|
|
17
|
-
from ert.dark_storage.endpoints.responses import data_for_response
|
|
18
|
-
from ert.storage import Storage
|
|
19
|
-
|
|
20
|
-
router = APIRouter(tags=["misfits"])
|
|
21
|
-
DEFAULT_STORAGEREADER = Depends(get_storage)
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
@router.get(
|
|
25
|
-
"/compute/misfits",
|
|
26
|
-
responses={
|
|
27
|
-
status.HTTP_200_OK: {
|
|
28
|
-
"content": {"text/csv": {}},
|
|
29
|
-
}
|
|
30
|
-
},
|
|
31
|
-
)
|
|
32
|
-
async def get_response_misfits(
|
|
33
|
-
*,
|
|
34
|
-
storage: Storage = DEFAULT_STORAGEREADER,
|
|
35
|
-
ensemble_id: UUID,
|
|
36
|
-
response_name: str,
|
|
37
|
-
realization_index: int | None = None,
|
|
38
|
-
summary_misfits: bool = False,
|
|
39
|
-
filter_on: Annotated[
|
|
40
|
-
str | None, Query(description="JSON string with filters")
|
|
41
|
-
] = None,
|
|
42
|
-
) -> Response:
|
|
43
|
-
ensemble = storage.get_ensemble(ensemble_id)
|
|
44
|
-
dataframe = data_for_response(
|
|
45
|
-
ensemble,
|
|
46
|
-
response_name,
|
|
47
|
-
json.loads(filter_on) if filter_on is not None else None,
|
|
48
|
-
)
|
|
49
|
-
if realization_index is not None:
|
|
50
|
-
dataframe = pd.DataFrame(dataframe.loc[realization_index]).T
|
|
51
|
-
|
|
52
|
-
response_dict = {}
|
|
53
|
-
for index, data in dataframe.iterrows():
|
|
54
|
-
data_df = pd.DataFrame(data).T
|
|
55
|
-
response_dict[index] = data_df
|
|
56
|
-
|
|
57
|
-
experiment = ensemble.experiment
|
|
58
|
-
response_type = experiment.response_key_to_response_type[response_name]
|
|
59
|
-
obs_keys = experiment.response_key_to_observation_key[response_type].get(
|
|
60
|
-
response_name, []
|
|
61
|
-
)
|
|
62
|
-
obs = _get_observations(
|
|
63
|
-
ensemble.experiment,
|
|
64
|
-
obs_keys,
|
|
65
|
-
json.loads(filter_on) if filter_on is not None else None,
|
|
66
|
-
)
|
|
67
|
-
|
|
68
|
-
if not obs_keys:
|
|
69
|
-
raise ValueError(f"No observations for key {response_name}")
|
|
70
|
-
if not obs:
|
|
71
|
-
raise ValueError(f"Cant fetch observations for key {response_name}")
|
|
72
|
-
o = obs[0]
|
|
73
|
-
|
|
74
|
-
def parse_index(x: Any) -> int | datetime:
|
|
75
|
-
try:
|
|
76
|
-
return int(x)
|
|
77
|
-
except ValueError:
|
|
78
|
-
return parse(x)
|
|
79
|
-
|
|
80
|
-
observation_df = pd.DataFrame(
|
|
81
|
-
data={"values": o["values"], "errors": o["errors"]},
|
|
82
|
-
index=[parse_index(x) for x in o["x_axis"]],
|
|
83
|
-
)
|
|
84
|
-
try:
|
|
85
|
-
result_df = calculate_signed_chi_squared_misfits(
|
|
86
|
-
response_dict, observation_df, summary_misfits
|
|
87
|
-
)
|
|
88
|
-
except Exception as misfits_exc:
|
|
89
|
-
raise exc.UnprocessableError(
|
|
90
|
-
f"Unable to compute misfits: {misfits_exc}"
|
|
91
|
-
) from misfits_exc
|
|
92
|
-
return Response(
|
|
93
|
-
content=result_df.to_csv().encode(),
|
|
94
|
-
media_type="text/csv",
|
|
95
|
-
)
|