osducli 0.0.47__tar.gz → 0.0.48__tar.gz

{osducli-0.0.47/src/osducli.egg-info → osducli-0.0.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osducli
-Version: 0.0.47
+Version: 0.0.48
 Summary: OSDU command line
 Author-email: Equinor ASA <mhew@equinor.com>
 License-Expression: Apache-2.0
@@ -20,6 +20,7 @@ Requires-Dist: osdu-api[common]==1.0.3
 Requires-Dist: requests
 Requires-Dist: tabulate
 Requires-Dist: packaging
+Requires-Dist: wbdutil==0.1.1
 Requires-Dist: msal
 Requires-Dist: msal-extensions
 Requires-Dist: azure-identity
@@ -49,13 +50,6 @@ OSDU Command Line Interface
 
 Command-line interface for interacting with OSDU.
 
-NOTE: With version 0.0.45 and earlier the pip install command may need extra parameter since a dependency is not available from pypi.org:
-
-.. code-block:: bash
-
-    pip install osducli --extra-index-url=https://community.opengroup.org/api/v4/projects/148/packages/pypi/simple
-
-
 Usage
 =====
 
@@ -81,6 +75,14 @@ For more information, specify the `-h` flag:
 Change Log
 ==========
 
+0.0.48
+------
+- Added commands for wbdutil (Wellbore DDMS Data Loader)
+
+0.0.47
+------
+- Maintenance release
+
 0.0.46
 ------
 - Simpler install command without extra-index-url

{osducli-0.0.47 → osducli-0.0.48}/README.rst

@@ -3,13 +3,6 @@ OSDU Command Line Interface
 
 Command-line interface for interacting with OSDU.
 
-NOTE: With version 0.0.45 and earlier the pip install command may need extra parameter since a dependency is not available from pypi.org:
-
-.. code-block:: bash
-
-    pip install osducli --extra-index-url=https://community.opengroup.org/api/v4/projects/148/packages/pypi/simple
-
-
 Usage
 =====
 
@@ -35,6 +28,14 @@ For more information, specify the `-h` flag:
 Change Log
 ==========
 
+0.0.48
+------
+- Added commands for wbdutil (Wellbore DDMS Data Loader)
+
+0.0.47
+------
+- Maintenance release
+
 0.0.46
 ------
 - Simpler install command without extra-index-url

{osducli-0.0.47 → osducli-0.0.48}/pyproject.toml

@@ -29,6 +29,7 @@ dependencies = [
     "requests",
     "tabulate",
     "packaging",
+    "wbdutil==0.1.1",
     # Azure specific
     "msal",
     "msal-extensions",
@@ -100,5 +101,8 @@ disable = [
     "fixme",
     "unknown-option-value",
     "unspecified-encoding",
-    "broad-exception-raised"
+    "broad-exception-raised",
+    "duplicate-code",
+    "unused-argument",
+    "too-many-statements",
 ]

osducli-0.0.48/src/osducli/VERSION

@@ -0,0 +1 @@
+0.0.48

{osducli-0.0.47 → osducli-0.0.48}/src/osducli/commands/config/consts.py

@@ -50,6 +50,7 @@ MSG_PROMPT_WORKFLOW_URL = "\nWorkflow API path []: "
 
 MSG_PROMPT_DATA_PARTITION = "\nData partition name []: "
 MSG_PROMPT_LEGAL_TAG = "\nManifest legal tag []: "
+MSG_PROMPT_OTHER_RELEVANT_DATA_COUNTRIES = "\nOther relevant data countries []: "
 MSG_PROMPT_ACL_VIEWER = "\nacl viewer []: "
 MSG_PROMPT_ACL_OWNER = "\nacl owner []: "
 

{osducli-0.0.47 → osducli-0.0.48}/src/osducli/commands/config/update.py

@@ -37,6 +37,7 @@ from osducli.commands.config.consts import (
     MSG_PROMPT_LEGAL_TAG,
     MSG_PROMPT_LEGAL_URL,
     MSG_PROMPT_MANAGE_GLOBAL,
+    MSG_PROMPT_OTHER_RELEVANT_DATA_COUNTRIES,
     MSG_PROMPT_REFRESH_TOKEN,
     MSG_PROMPT_SCHEMA_URL,
     MSG_PROMPT_SCOPES,
@@ -64,6 +65,7 @@ from osducli.config import (
     CONFIG_FILE_URL,
     CONFIG_LEGAL_TAG,
     CONFIG_LEGAL_URL,
+    CONFIG_OTHER_RELEVANT_DATA_COUNTRIES,
     CONFIG_REFRESH_TOKEN,
     CONFIG_SCHEMA_URL,
     CONFIG_SEARCH_URL,
@@ -277,6 +279,12 @@ def _configure_connection(config):  # noqa C901
         CONFIG_LEGAL_TAG,
         fallback="opendes-public-usa-dataset-7643990",
     )
+    other_relevant_data_countries = _prompt_default_from_config(
+        MSG_PROMPT_OTHER_RELEVANT_DATA_COUNTRIES,
+        config,
+        CONFIG_OTHER_RELEVANT_DATA_COUNTRIES,
+        fallback="US",
+    )
     acl_viewer = _prompt_default_from_config(
         MSG_PROMPT_ACL_VIEWER,
         config,
@@ -320,6 +328,8 @@ def _configure_connection(config):  # noqa C901
         config.set_value("core", CONFIG_DATA_PARTITION_ID, data_partition_id)
     if legal_tag != "":
         config.set_value("core", CONFIG_LEGAL_TAG, legal_tag)
+    if other_relevant_data_countries != "":
+        config.set_value("core", CONFIG_OTHER_RELEVANT_DATA_COUNTRIES, other_relevant_data_countries)
     if acl_viewer != "":
         config.set_value("core", CONFIG_ACL_VIEWER, acl_viewer)
     if acl_owner != "":

{osducli-0.0.47 → osducli-0.0.48}/src/osducli/commands/storage/add.py

@@ -38,8 +38,6 @@ logger = get_logger(__name__)
     "-b",
     "--batch",
     help="Number of records to add per API call. If not specified records are uploaded as is.",
-    is_flag=False,
-    flag_value=200,
     type=int,
     default=None,
     show_default=True,

osducli-0.0.48/src/osducli/commands/wbdutil/__init__.py

@@ -0,0 +1,13 @@
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+"""Wellbore DDMS Data Loader commands"""

osducli-0.0.48/src/osducli/commands/wbdutil/_const.py

@@ -0,0 +1,16 @@
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+"""Wellbore DDMS Data Loader constants"""
+
+WBDUTIL_SERVICE_NAME = "Wellbore DDMS Data Loader"
+WBDUTIL_DOCUMENTATION = "https://community.opengroup.org/osdu/ui/data-loading/wellbore-ddms-data-loader"  # noqa: E501

osducli-0.0.48/src/osducli/commands/wbdutil/config_file.py

@@ -0,0 +1,40 @@
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+import json
+import tempfile
+
+from osducli.config import CLIConfig
+
+
+def get_config_path(config: CLIConfig):
+    """
+    Takes a config object and writes a mapped config to a temporary JSON file.
+    Returns the path to the temp file.
+    """
+    output = {
+        "base_url": config.get('core', 'server'),
+        "data_partition_id": config.get('core', 'data_partition_id'),
+        "legal": {
+            "legaltags": [config.get('core', 'legal_tag')],
+            "otherRelevantDataCountries": [config.get('core', 'other_relevant_data_countries')],
+            "status": "compliant"
+        },
+        "data": {
+            "default": {
+                "viewers": [config.get('core', 'acl_viewer')],
+                "owners": [config.get('core', 'acl_owner')]
+            }
+        }
+    }
+    with tempfile.NamedTemporaryFile('w', delete=False, suffix='.json') as tmp:
+        json.dump(output, tmp, indent=4)
+        return tmp.name

osducli-0.0.48/src/osducli/commands/wbdutil/download.py

@@ -0,0 +1,38 @@
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+"""Retrieve WellLog data from an OSDU instance and save to a LAS format file"""
+import os
+
+import click
+from wbdutil.commands.download import download_las
+
+from osducli.click_cli import CustomClickCommand, State, command_with_output
+from osducli.cliclient import CliOsduClient, handle_cli_exceptions
+from osducli.commands.wbdutil.config_file import get_config_path
+
+
+# click entry point
+@click.command(cls=CustomClickCommand, help="Download WellLog data to LAS file")
+@click.option("-id", "--id", "_id", help="WellLog id to retrieve", required=True)
+@click.option("-o", "--out", "_file", help="The output file path", required=True)
+@click.option("-c", "--curves", "_curves", help="List of curves to retrieve, or none to get all curves", required=False)
+@handle_cli_exceptions
+@command_with_output(None)
+def _click_command(state: State, _id: str, _file: str, _curves: list[str]):
+    client = CliOsduClient(state.config)
+    client.token_refresher.authorize()
+    token = client.token_refresher.access_token
+    config_path = get_config_path(state.config)
+    try:
+        download_las(_id, _file, token, config_path, _curves)
+    finally:
+        os.remove(config_path)

osducli-0.0.48/src/osducli/commands/wbdutil/ingest/__init__.py

@@ -0,0 +1,13 @@
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+"""Wellbore DDMS Data Loader ingest commands"""

osducli-0.0.48/src/osducli/commands/wbdutil/ingest/data.py

@@ -0,0 +1,37 @@
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+"""Write data from a LAS file to an existing WellLog"""
+import os
+
+import click
+from wbdutil.commands.ingest import welllog_data
+
+from osducli.click_cli import CustomClickCommand, State, command_with_output
+from osducli.cliclient import CliOsduClient, handle_cli_exceptions
+from osducli.commands.wbdutil.config_file import get_config_path
+
+
+# click entry point
+@click.command(cls=CustomClickCommand, help="Write data from a LAS file to an existing WellLog")
+@click.option("-id", "--id", "_id", help="WellLog id to update", required=True)
+@click.option("-p", "--path", "_path", help=" Path to a file or folder containing one or more LAS file(s)", required=True)
+@handle_cli_exceptions
+@command_with_output(None)
+def _click_command(state: State, _id: str, _path: str):
+    client = CliOsduClient(state.config)
+    client.token_refresher.authorize()
+    token = client.token_refresher.access_token
+    config_path = get_config_path(state.config)
+    try:
+        welllog_data(_id, _path, token, config_path)
+    finally:
+        os.remove(config_path)

osducli-0.0.48/src/osducli/commands/wbdutil/ingest/wellbore.py

@@ -0,0 +1,37 @@
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+"""Ingest a LAS file (single) or directory of LAS files (bulk) into OSDU"""
+import os
+
+import click
+from wbdutil.commands.ingest import wellbore
+
+from osducli.click_cli import CustomClickCommand, State, command_with_output
+from osducli.cliclient import CliOsduClient, handle_cli_exceptions
+from osducli.commands.wbdutil.config_file import get_config_path
+
+
+# click entry point
+@click.command(cls=CustomClickCommand, help="Ingest LAS file(s) into OSDU")
+@click.option("-p", "--path", "_path", help="Path and filename of a LAS file OR path to directory containing LAS and config files", required=True)
+@click.option("--norecognize", "_no_recognize", help="If specified the application won't attempt to recognize the curve families.", is_flag=True, required=False)
+@handle_cli_exceptions
+@command_with_output(None)
+def _click_command(state: State, _path: str, _no_recognize: bool = False):
+    client = CliOsduClient(state.config)
+    client.token_refresher.authorize()
+    token = client.token_refresher.access_token
+    config_path = get_config_path(state.config)
+    try:
+        wellbore(_path, token, config_path, _no_recognize)
+    finally:
+        os.remove(config_path)

osducli-0.0.48/src/osducli/commands/wbdutil/list/__init__.py

@@ -0,0 +1,13 @@
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+"""Wellbore DDMS Data Loader list commands"""

osducli-0.0.48/src/osducli/commands/wbdutil/list/curves.py

@@ -0,0 +1,38 @@
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+""" Retrieve and print WellLog record from an OSDU instance"""
+
+import os
+
+import click
+from wbdutil.commands.list_osdu import welllog_data
+
+from osducli.click_cli import CustomClickCommand, State, command_with_output
+from osducli.cliclient import CliOsduClient, handle_cli_exceptions
+from osducli.commands.wbdutil.config_file import get_config_path
+
+
+# click entry point
+@click.command(cls=CustomClickCommand, help="Retrieve and print WellLog curve data")
+@click.option("-id", "--id", "_id", help="WellLog id to retrieve", required=True)
+@click.option("-c", "--curves", "_curves", help="List of curves to retrieve, or none to get all curves", required=False)
+@handle_cli_exceptions
+@command_with_output(None)
+def _click_command(state: State, _id: str, _curves: list[str]):
+    client = CliOsduClient(state.config)
+    client.token_refresher.authorize()
+    token = client.token_refresher.access_token
+    config_path = get_config_path(state.config)
+    try:
+        return welllog_data(_id, token, config_path, _curves)
+    finally:
+        os.remove(config_path)

osducli-0.0.48/src/osducli/commands/wbdutil/list/wellbore.py

@@ -0,0 +1,38 @@
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+""" Retrieve and print WellLog record from an OSDU instance"""
+
+import os
+
+import click
+from wbdutil.commands.list_osdu import welllog
+
+from osducli.click_cli import CustomClickCommand, State, command_with_output
+from osducli.cliclient import CliOsduClient, handle_cli_exceptions
+from osducli.commands.wbdutil.config_file import get_config_path
+
+
+# click entry point
+@click.command(cls=CustomClickCommand, help="Retrieve and print Wellbore record")
+@click.option("-id", "--id", "_id", help="Wellbore id to retrieve", required=True)
+@click.option("--curveids", "_curveids", help="Show only the curve ids", is_flag=True, required=False)
+@handle_cli_exceptions
+@command_with_output(None)
+def _click_command(state: State, _id: str, _curveids: bool = False):
+    client = CliOsduClient(state.config)
+    client.token_refresher.authorize()
+    token = client.token_refresher.access_token
+    config_path = get_config_path(state.config)
+    try:
+        return welllog(_id, token, config_path, _curveids)
+    finally:
+        os.remove(config_path)

osducli-0.0.48/src/osducli/commands/wbdutil/list/welllog.py

@@ -0,0 +1,38 @@
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+""" Retrieve and print WellLog record from an OSDU instance"""
+
+import os
+
+import click
+from wbdutil.commands.list_osdu import welllog
+
+from osducli.click_cli import CustomClickCommand, State, command_with_output
+from osducli.cliclient import CliOsduClient, handle_cli_exceptions
+from osducli.commands.wbdutil.config_file import get_config_path
+
+
+# click entry point
+@click.command(cls=CustomClickCommand, help="Retrieve and print WellLog record")
+@click.option("-id", "--id", "_id", help="WellLog id to retrieve", required=True)
+@click.option("--curveids", "_curveids", help="Show only the curve ids", is_flag=True, required=False)
+@handle_cli_exceptions
+@command_with_output(None)
+def _click_command(state: State, _id: str, _curveids: bool = False):
+    client = CliOsduClient(state.config)
+    client.token_refresher.authorize()
+    token = client.token_refresher.access_token
+    config_path = get_config_path(state.config)
+    try:
+        return welllog(_id, token, config_path, _curveids)
+    finally:
+        os.remove(config_path)

osducli-0.0.48/src/osducli/commands/wbdutil/parse/__init__.py

@@ -0,0 +1,13 @@
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+"""Wellbore DDMS Data Loader parse commands"""

osducli-0.0.48/src/osducli/commands/wbdutil/parse/convert.py

@@ -0,0 +1,35 @@
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+"""Convert a LAS file to Wellbore and Well Log and write to JSON files"""
+
+import os
+
+import click
+from wbdutil.commands.parse import convert
+
+from osducli.click_cli import CustomClickCommand, State, command_with_output
+from osducli.cliclient import handle_cli_exceptions
+from osducli.commands.wbdutil.config_file import get_config_path
+
+
+# click entry point
+@click.command(cls=CustomClickCommand, help="Convert a LAS file to Wellbore and WellLog and write to JSON files")
+@click.option("-id", "--id", "_id", help="Record id to retrieve", required=True)
+@click.option("-i", "--input", "_file", help="Path to a file or folder containing one or more LAS file(s)", required=True)
+@handle_cli_exceptions
+@command_with_output(None)
+def _click_command(state: State, _id: str, _file: str):
+    config_path = get_config_path(state.config)
+    try:
+        return convert(_file, _id, config_path)
+    finally:
+        os.remove(config_path)

osducli-0.0.48/src/osducli/commands/wbdutil/parse/print.py

@@ -0,0 +1,27 @@
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+"""Print a LAS file header"""
+
+import click
+from wbdutil.commands.parse import printlas
+
+from osducli.click_cli import CustomClickCommand, State, command_with_output
+from osducli.cliclient import handle_cli_exceptions
+
+
+# click entry point
+@click.command(cls=CustomClickCommand, help="Print a LAS file header")
+@click.option("-i", "--input", "_file", help="Path and filename of a LAS file, or folder containing LAS files", required=True)
+@handle_cli_exceptions
+@command_with_output(None)
+def _click_command(state: State, _file: str):
+    return printlas(_file)

osducli-0.0.48/src/osducli/commands/wbdutil/search.py

@@ -0,0 +1,36 @@
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+"""Retrieve and print the ids of wellbores that match the specified name"""
+import os
+
+import click
+from wbdutil.commands.search import wellbore_search
+
+from osducli.click_cli import CustomClickCommand, State, command_with_output
+from osducli.cliclient import CliOsduClient, handle_cli_exceptions
+from osducli.commands.wbdutil.config_file import get_config_path
+
+
+# click entry point
+@click.command(cls=CustomClickCommand, help="Retrieve and print the ids of wellbores that match the specified name")
+@click.option("-n", "--name", "_name", help="The wellbore name to search for", required=True)
+@handle_cli_exceptions
+@command_with_output(None)
+def _click_command(state: State, _name: str):
+    client = CliOsduClient(state.config)
+    client.token_refresher.authorize()
+    token = client.token_refresher.access_token
+    config_path = get_config_path(state.config)
+    try:
+        return wellbore_search(_name, token, config_path)
+    finally:
+        os.remove(config_path)

osducli-0.0.48/src/osducli/commands/wbdutil/update.py

@@ -0,0 +1,37 @@
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+"""Update an existing WellLog record"""
+import os
+
+import click
+from wbdutil.commands.update import welllog
+
+from osducli.click_cli import CustomClickCommand, State, command_with_output
+from osducli.cliclient import CliOsduClient, handle_cli_exceptions
+from osducli.commands.wbdutil.config_file import get_config_path
+
+
+# click entry point
+@click.command(cls=CustomClickCommand, help="Update an existing WellLog record")
+@click.option("-id", "--id", "_id", help="Record id to update", required=True)
+@click.option("--curvefam", "_curvefam", help="If true, recognize and update the curve families", is_flag=True, required=False)
+@handle_cli_exceptions
+@command_with_output(None)
+def _click_command(state: State, _id: str, _curvefam: bool = False):
+    client = CliOsduClient(state.config)
+    client.token_refresher.authorize()
+    token = client.token_refresher.access_token
+    config_path = get_config_path(state.config)
+    try:
+        return welllog(_id, token, config_path, _curvefam)
+    finally:
+        os.remove(config_path)

{osducli-0.0.47 → osducli-0.0.48}/src/osducli/config.py

@@ -44,6 +44,7 @@ CONFIG_WELLBORE_DDMS_URL = "wellbore_ddms_url"
 
 CONFIG_DATA_PARTITION_ID = "data_partition_id"
 CONFIG_LEGAL_TAG = "legal_tag"
+CONFIG_OTHER_RELEVANT_DATA_COUNTRIES = "other_relevant_data_countries"
 CONFIG_ACL_VIEWER = "acl_viewer"
 CONFIG_ACL_OWNER = "acl_owner"