osducli 0.0.49__tar.gz → 0.0.50__tar.gz

{osducli-0.0.49/src/osducli.egg-info → osducli-0.0.50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osducli
-Version: 0.0.49
+Version: 0.0.50
 Summary: OSDU command line
 Author-email: Equinor ASA <mhew@equinor.com>
 License-Expression: Apache-2.0
@@ -75,6 +75,10 @@ For more information, specify the `-h` flag:
 Change Log
 ==========
 
+0.0.50
+------
+- Maintenance release
+
 0.0.49
 ------
 - Added commands for Wellbore DDMS API

{osducli-0.0.49 → osducli-0.0.50}/README.rst

@@ -28,6 +28,10 @@ For more information, specify the `-h` flag:
 Change Log
 ==========
 
+0.0.50
+------
+- Maintenance release
+
 0.0.49
 ------
 - Added commands for Wellbore DDMS API

osducli-0.0.50/src/osducli/VERSION

@@ -0,0 +1 @@
+0.0.50

{osducli-0.0.49 → osducli-0.0.50}/src/osducli/commands/wbdutil/config_file.py

@@ -38,9 +38,9 @@ def get_config_path(config: CLIConfig,
                 "owners": [config.get('core', 'acl_owner')]
             }
         },
-        "wellbore_mapping": { get_mapping(wellbore_mapping_file) },
-        "welllog_mapping": { get_mapping(welllog_mapping_file) },
-        "las_file_mapping": { get_mapping(las_mapping_file) }
+        "wellbore_mapping": get_mapping(wellbore_mapping_file),
+        "welllog_mapping": get_mapping(welllog_mapping_file),
+        "las_file_mapping": get_mapping(las_mapping_file)
     }
     with tempfile.NamedTemporaryFile('w', delete=False, suffix='.json') as tmp:
         json.dump(output, tmp, indent=4)

{osducli-0.0.49 → osducli-0.0.50}/src/osducli/commands/wellbore_ddms/ppfgdataset/session/update.py

@@ -21,17 +21,17 @@ from osducli.commands.wellbore_ddms._const import WELLBORE_DDMS_PPFGDATASET_PATH
 @click.command(cls=CustomClickCommand, help="Update a session, either commit or abandon")
 @click.option("-id", "--id", "_id", help="PPFG Dataset id to update", required=True)
 @click.option("-s", "--session", "_ses", help="PPFG Dataset session id to update", required=True)
-@click.option("-c", "--commit", "_com", is_flag=True, help="Commit or abandon", required=False)
+@click.option("-a", "--abandon", "_aba", is_flag=True, help="Abandon session. Will commit session if flag is omitted", required=False)
 @handle_cli_exceptions
 @command_with_output()
-def _click_command(state: State, _id: str, _ses: str, _com: bool):
-    return update_session(state, _id, _ses, _com)
+def _click_command(state: State, _id: str, _ses: str, _aba: bool):
+    return update_session(state, _id, _ses, _aba)
 
 
-def update_session(state: State, record_id: str, session_id: str, commit: bool):
+def update_session(state: State, record_id: str, session_id: str, abandon: bool = False):
     """Update a session, either commit or abandon"""
     client = CliOsduClient(state.config)
     wellbore_client = client.get_wellbore_ddms_client(url_extra_path=WELLBORE_DDMS_PPFGDATASET_PATH)
-    response = wellbore_client.update_wbddms_session(record_id, session_id, commit)
+    response = wellbore_client.update_wbddms_session(record_id, session_id, abandon)
     client.check_status_code(response)
     return response.json()

{osducli-0.0.49 → osducli-0.0.50}/src/osducli/commands/wellbore_ddms/trajectory/session/update.py

@@ -21,17 +21,17 @@ from osducli.commands.wellbore_ddms._const import WELLBORE_DDMS_TRAJECTORY_PATH
 @click.command(cls=CustomClickCommand, help="Update a session, either commit or abandon")
 @click.option("-id", "--id", "_id", help="Wellbore Trajectory id to update", required=True)
 @click.option("-s", "--session", "_ses", help="Wellbore Trajectory session id to update", required=True)
-@click.option("-c", "--commit", "_com", is_flag=True, help="Commit or abandon", required=False)
+@click.option("-a", "--abandon", "_aba", is_flag=True, help="Abandon session. Will commit session if flag is omitted", required=False)
 @handle_cli_exceptions
 @command_with_output()
-def _click_command(state: State, _id: str, _ses: str, _com: bool):
-    return update_session(state, _id, _ses, _com)
+def _click_command(state: State, _id: str, _ses: str, _aba: bool):
+    return update_session(state, _id, _ses, _aba)
 
 
-def update_session(state: State, record_id: str, session_id: str, commit: bool):
+def update_session(state: State, record_id: str, session_id: str, abandon: bool = False):
     """Update a session, either commit or abandon"""
     client = CliOsduClient(state.config)
     wellbore_client = client.get_wellbore_ddms_client(url_extra_path=WELLBORE_DDMS_TRAJECTORY_PATH)
-    response = wellbore_client.update_wbddms_session(record_id, session_id, commit)
+    response = wellbore_client.update_wbddms_session(record_id, session_id, abandon)
     client.check_status_code(response)
     return response.json()

{osducli-0.0.49 → osducli-0.0.50}/src/osducli/commands/wellbore_ddms/well_log/data/statistics.py

@@ -20,7 +20,7 @@ from osducli.commands.wellbore_ddms._const import WELLBORE_DDMS_WELL_LOG_PATH
 # click entry point
 @click.command(cls=CustomClickCommand, help="Get WellLog data statistics by id")
 @click.option("-id", "--id", "_id", help="WellLog id to search for", required=True)
-@click.option("-c", "--curves", "_curves", help="List of curves or array to be returned. All curves if empty", required=False)
+@click.option("-cu", "--curves", "_curves", help="List of curves or array to be returned. All curves if empty", required=False)
 @handle_cli_exceptions
 @command_with_output()
 def _click_command(state: State, _id: str, _curves: str):

{osducli-0.0.49 → osducli-0.0.50}/src/osducli/commands/wellbore_ddms/well_log/session/update.py

@@ -21,17 +21,17 @@ from osducli.commands.wellbore_ddms._const import WELLBORE_DDMS_WELL_LOG_PATH
 @click.command(cls=CustomClickCommand, help="Update a session, either commit or abandon")
 @click.option("-id", "--id", "_id", help="WellLog id to update", required=True)
 @click.option("-s", "--session", "_ses", help="WellLog session id to update", required=True)
-@click.option("-c", "--commit", "_com", is_flag=True, help="Commit or abandon", required=False)
+@click.option("-a", "--abandon", "_aba", is_flag=True, help="Abandon session. Will commit session if flag is omitted", required=False)
 @handle_cli_exceptions
 @command_with_output()
-def _click_command(state: State, _id: str, _ses: str, _com: bool):
-    return update_session(state, _id, _ses, _com)
+def _click_command(state: State, _id: str, _ses: str, _aba: bool):
+    return update_session(state, _id, _ses, _aba)
 
 
-def update_session(state: State, record_id: str, session_id: str, commit: bool):
+def update_session(state: State, record_id: str, session_id: str, abandon: bool = False):
     """Update a session, either commit or abandon"""
     client = CliOsduClient(state.config)
     wellbore_client = client.get_wellbore_ddms_client(url_extra_path=WELLBORE_DDMS_WELL_LOG_PATH)
-    response = wellbore_client.update_wbddms_session(record_id, session_id, commit)
+    response = wellbore_client.update_wbddms_session(record_id, session_id, abandon)
     client.check_status_code(response)
     return response.json()

{osducli-0.0.49 → osducli-0.0.50}/src/osducli/commands/wellbore_ddms/well_log/version/data/statistics.py

@@ -21,7 +21,7 @@ from osducli.commands.wellbore_ddms._const import WELLBORE_DDMS_WELL_LOG_PATH
 @click.command(cls=CustomClickCommand, help="Get WellLog data statistics by id and version")
 @click.option("-id", "--id", "_id", help="WellLog id to search for", required=True)
 @click.option("-v", "--version", "_ver", help="WellLog version to search for", required=True)
-@click.option("-c", "--curves", "_curves", help="List of curves or array to be returned. All curves if empty", required=False)
+@click.option("-cu", "--curves", "_curves", help="List of curves or array to be returned. All curves if empty", required=False)
 @handle_cli_exceptions
 @command_with_output()
 def _click_command(state: State, _id: str, _ver: str, _curves: str):

{osducli-0.0.49 → osducli-0.0.50}/src/osducli/commands/wellbore_ddms/wellpressure_test_raw_measurement/session/update.py

@@ -23,17 +23,17 @@ from osducli.commands.wellbore_ddms._const import (
 @click.command(cls=CustomClickCommand, help="Update a session, either commit or abandon")
 @click.option("-id", "--id", "_id", help="Wellpressure Test Raw Measurement id to update", required=True)
 @click.option("-s", "--session", "_ses", help="Wellpressure Test Raw Measurement session id to update", required=True)
-@click.option("-c", "--commit", "_com", is_flag=True, help="Commit or abandon", required=False)
+@click.option("-a", "--abandon", "_aba", is_flag=True, help="Abandon session. Will commit session if flag is omitted", required=False)
 @handle_cli_exceptions
 @command_with_output()
-def _click_command(state: State, _id: str, _ses: str, _com: bool):
-    return update_session(state, _id, _ses, _com)
+def _click_command(state: State, _id: str, _ses: str, _aba: bool):
+    return update_session(state, _id, _ses, _aba)
 
 
-def update_session(state: State, record_id: str, session_id: str, commit: bool):
+def update_session(state: State, record_id: str, session_id: str, abandon: bool = False):
     """Update a session, either commit or abandon"""
     client = CliOsduClient(state.config)
     wellbore_client = client.get_wellbore_ddms_client(url_extra_path=WELLBORE_DDMS_WELLPRESSURE_TEST_RAW_MEASUREMENT_PATH)
-    response = wellbore_client.update_wbddms_session(record_id, session_id, commit)
+    response = wellbore_client.update_wbddms_session(record_id, session_id, abandon)
     client.check_status_code(response)
     return response.json()

{osducli-0.0.49 → osducli-0.0.50}/src/osducli/wbddms_client.py

@@ -126,9 +126,9 @@ class WellboreDdmsClient(BaseClient):
             url=f"{self.wellbore_ddms_url}/{record_id}/sessions/{session_id}"
         )
 
-    def update_wbddms_session(self, record_id: str, session_id: str, commit: bool = True) -> requests.Response:
+    def update_wbddms_session(self, record_id: str, session_id: str, abandon: bool = False) -> requests.Response:
         """Update a session, either commit or abandon"""
-        data = '{"state": ' + ('commit' if commit else 'abandon') + '}'
+        data = {"state": ("abandon" if abandon else "commit")}
         return self.make_request(
             method=HttpMethod.PATCH,
             url=f"{self.wellbore_ddms_url}/{record_id}/sessions/{session_id}",

{osducli-0.0.49 → osducli-0.0.50/src/osducli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osducli
-Version: 0.0.49
+Version: 0.0.50
 Summary: OSDU command line
 Author-email: Equinor ASA <mhew@equinor.com>
 License-Expression: Apache-2.0
@@ -75,6 +75,10 @@ For more information, specify the `-h` flag:
 Change Log
 ==========
 
+0.0.50
+------
+- Maintenance release
+
 0.0.49
 ------
 - Added commands for Wellbore DDMS API

osducli-0.0.49/src/osducli/VERSION

@@ -1 +0,0 @@
-0.0.49