osducli 0.0.46__py3-none-any.whl → 0.0.48__py3-none-any.whl

osducli/VERSION

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

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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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"
 

osducli/version.py

@@ -9,8 +9,10 @@
 #  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 os
 
 
 def get_version():
-    with open("VERSION") as fh:
+    version_file = os.path.join(os.path.dirname(__file__), "VERSION")
+    with open(version_file) as fh:
         return fh.read().strip()

{osducli-0.0.46.dist-info → osducli-0.0.48.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osducli
-Version: 0.0.46
+Version: 0.0.48
 Summary: OSDU command line
 Author-email: Equinor ASA <mhew@equinor.com>
 License-Expression: Apache-2.0
@@ -13,12 +13,14 @@ Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.12
 Description-Content-Type: text/x-rst
+License-File: LICENSE.md
 Requires-Dist: click
 Requires-Dist: jmespath
 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
@@ -41,19 +43,13 @@ Requires-Dist: testfixtures; extra == "dev"
 Requires-Dist: setuptools; extra == "dev"
 Requires-Dist: tox; extra == "dev"
 Requires-Dist: docutils; extra == "dev"
+Dynamic: license-file
 
 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
 =====
 
@@ -79,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.46.dist-info → osducli-0.0.48.dist-info}/RECORD

@@ -1,11 +1,12 @@
+osducli/VERSION,sha256=QFCcUR32EpQ_Fv-h7hQuBlaPU04vEPOQ5TxCUdhmjaY,6
 osducli/__init__.py,sha256=J3RwqAbN7MWvz8vL24fMUar9Sfk8nMI8xq_aSHGXUy8,591
 osducli/__main__.py,sha256=4HonhahSaS3Un0f93qnbs_pmJ5pbbVHU-qdhsssVkB0,3661
 osducli/click_cli.py,sha256=EIe42DOnHDRKU3mPGwT12jI-yX3hsBOp_nS4nMTWc_Y,10864
 osducli/cliclient.py,sha256=u1pF5wYK1OmboGQld6cLsVXsSr0Fau000dZjvsW-yK0,13872
-osducli/config.py,sha256=lSDxp15JiJQ_J_YjdvI1q243uexzxZpXSYMsSgQIgdQ,7802
+osducli/config.py,sha256=OSsUK2UNiEYL_ikpAKkJhpodxMYMw39mEhav5IoUfRo,7873
 osducli/log.py,sha256=a5pzV2QIOqFEWCGFj01FaZk9PEzMkAr6duHei_dCme8,1549
 osducli/state.py,sha256=b0GHH2oZ-4ogtmHenNkYwNRSE3OpSTL0XklbKVjUAKQ,3335
-osducli/version.py,sha256=pARJXagpA5pHAXYQnmOv3kjtYuOAXYmIEi3eWrobmvI,639
+osducli/version.py,sha256=I8tEetbJZtyhZvVgLMOKwbOnBCKYEfpQlT0YcTP3nXc,722
 osducli/wbddms_client.py,sha256=ANzhNCQ7TkM2OiPy18w4bJgL8CmveteUXsiDjlQyNTw,2686
 osducli/auth/__init__.py,sha256=p2bZquIGOPfofHV6GIzWRUv_b9O_pIH5BTyv_gfQT6c,553
 osducli/auth/aws_token_credential.py,sha256=awKDU2nA3iGXYdIR1NTBk6z64ImIC7okfYr8x7FOM-s,2322
@@ -15,11 +16,11 @@ osducli/auth/msal_non_interactive.py,sha256=qgI1Gj0uZS5-ixypiV7fFY-hRo05SoZJB5YH
 osducli/auth/token_credential.py,sha256=kYYGWx8lH_s9eyD53McBzSa1vaCK7qhj20fUt2W2ZcA,3488
 osducli/commands/__init__.py,sha256=p2bZquIGOPfofHV6GIzWRUv_b9O_pIH5BTyv_gfQT6c,553
 osducli/commands/config/__init__.py,sha256=dueEKDys38kNW9E9NMK7CqOImEX_IsN0wcCK1rNQteU,576
-osducli/commands/config/consts.py,sha256=b4uA03wKOgTYTGfE6OyZZHhfvWnhLKgjdfnEJImNT3Q,2671
+osducli/commands/config/consts.py,sha256=BkFGAGsrfV-5oZr9nRTUeTcdLzMg56FIT9_UM6p2Gsg,2753
 osducli/commands/config/default.py,sha256=AsQPb7mXrR2AivfYK2p0bUKKoraJg7JdJewhV7KwLMU,2243
 osducli/commands/config/info.py,sha256=YMY3XNbNfg3mwHHeJp8Mm1ktzDuipO8xIZhO_5gk1J0,2194
 osducli/commands/config/list.py,sha256=YyOPUhxx6QefqKU3ExLSrkMKS75Fa7gYbuHOOPwgx0M,2242
-osducli/commands/config/update.py,sha256=k4oK4RXuBENq4FlNsBSu-9BvjQ0NtioOfrkKaWeeX8g,11773
+osducli/commands/config/update.py,sha256=9fmhuV5lQKqkxwO6PwMjObO6UVYW5TKS_fkZrjpVPg4,12213
 osducli/commands/crs/__init__.py,sha256=UzEngPBaTusYdj9JNPMAjg8fAczS1_dsG0Ti8CT19Lw,611
 osducli/commands/crs/_const.py,sha256=8QaIrpQxrebHJu0guwWgPWlw8mzLVcbXAzcri9e7jsk,1077
 osducli/commands/crs/areas.py,sha256=Rz4Sr_TecFC-jtWWfQ6WjAxsa3KFL59aRGeBnMexVZM,1265
@@ -74,7 +75,7 @@ osducli/commands/status/__init__.py,sha256=5g1PB_tU0sqP7aplnihjfhMzVVQdlB3Y01QIe
 osducli/commands/status/status.py,sha256=yh6KVUpNYbrLJIH-7GjMyo2MpR8Wvycr4KdkxUI1V5A,4543
 osducli/commands/storage/__init__.py,sha256=Ilc97Kje3VVLZIBJucd_2jsW1GF5En00xF-A6kiLAFM,585
 osducli/commands/storage/_const.py,sha256=a7oIWewDVdgbE1bHcg8QTQDppVT48pgP1Yl-l8tCRhs,847
-osducli/commands/storage/add.py,sha256=nDKP0490dU18Dtpaun3rluaCguJqtAFAxkS1P7WtG2Q,3386
+osducli/commands/storage/add.py,sha256=a4KP-MK1KE02Cs0Io_bYbvBw_u6LD1SeIF0SF2e1zjU,3347
 osducli/commands/storage/delete.py,sha256=ryjrd24wiJlTAL6jIsTW1gCxB0icAMu0YIyUTx578h0,1613
 osducli/commands/storage/get.py,sha256=FgjoN_1cY90cbU1osh53XviGvTZaPtRjthUmtP2Y2-k,2136
 osducli/commands/storage/info.py,sha256=CGbA92GJYkWcLXHx1Z4i9g7Auk-ws2Cg6n6X7_m27iw,1345
@@ -86,6 +87,22 @@ osducli/commands/unit/info.py,sha256=3mAB14C5256cDQGR_pUbSpKXN-0ohA7gxqxwq4t4VP8
 osducli/commands/unit/list.py,sha256=-5yEk0RHNZudeaaRzzCQexUHR6kCYAzM60YaO0EujVI,1288
 osducli/commands/version/__init__.py,sha256=S8QUNV3WSGTJAWwzvPokDscvBP4m0BAwXV_JhSA0kD0,580
 osducli/commands/version/version.py,sha256=5Yc2e0IDlFJtbZvGWVSXFHBWtBO48K60KRZmpLGDjg4,4246
+osducli/commands/wbdutil/__init__.py,sha256=jmG3Hw7UtR63wI2fCYhKgiLJrRXZChEnihA0VksUhb0,595
+osducli/commands/wbdutil/_const.py,sha256=ImAh9YWr-Tf74FLBznE-bGf9E80LmDIMl-RAaAETeTU,767
+osducli/commands/wbdutil/config_file.py,sha256=kO55D8nzmGm69gAltSWnlw5HmqxqkhzkYQQtECgtWCs,1492
+osducli/commands/wbdutil/download.py,sha256=CZ_JRd9CgF2V0oWB7y-ul7mV2oo77LI-MipUDf94XQo,1723
+osducli/commands/wbdutil/search.py,sha256=ULXh6cPmC34x0-FU66t9LsfhgRUH6Og5YQ_dazr33oQ,1531
+osducli/commands/wbdutil/update.py,sha256=RizosFp3f1VOvvTGDL5QIkm9vdrcrR1PxsHssyKJY7s,1588
+osducli/commands/wbdutil/ingest/__init__.py,sha256=thFrBRB9zrW3c-LrmGhCFa5i24_cTVTbFLcdBkNtORI,602
+osducli/commands/wbdutil/ingest/data.py,sha256=ZTb2qvlT5kwaUUGTtpzpuSGqqXm6EkJboRskDWqZXv8,1602
+osducli/commands/wbdutil/ingest/wellbore.py,sha256=dh7x2kUeHH75LW2B1bOCmWV4xzZOkZmG-ck_ag6WF7g,1728
+osducli/commands/wbdutil/list/__init__.py,sha256=C8Yz3XlhSN1sV_Lpjt-h49DhK551zVz25iKuWacN78s,600
+osducli/commands/wbdutil/list/curves.py,sha256=wXzOF1Cfx7YXj35i2O5UsA-yYC984Kj-xB5FiXwXF10,1618
+osducli/commands/wbdutil/list/wellbore.py,sha256=VuOXqiC6-3vL97OoMxYj-5cuoWuei6gHLJ_bztCmdvo,1595
+osducli/commands/wbdutil/list/welllog.py,sha256=fTCNqiL9DSD6TU3RQubp6chzbU1FcO1VtaDEie_wSfg,1593
+osducli/commands/wbdutil/parse/__init__.py,sha256=fgdJNGYpGQpPwCZbqfCR5t1WlB11HZ71-ykDcwfb-sA,601
+osducli/commands/wbdutil/parse/convert.py,sha256=DuGHrkQZFGZl3eoy3DulI-jvPtQckqAc7FO7zlq-_e0,1485
+osducli/commands/wbdutil/parse/print.py,sha256=9uATb2efh38Hj5aLiw1ZC5zFCoEGJyshnO8haXTKJ6k,1114
 osducli/commands/wellbore_ddms/__init__.py,sha256=AvXe60cTMl2ptWH6-wjaODGpzOiQazUJ05yrBkSlXYo,583
 osducli/commands/wellbore_ddms/_const.py,sha256=XP4Cc19vBVG88N5qXDvPFhJEtSD4vKw05lnEwDTKRqM,1084
 osducli/commands/wellbore_ddms/info.py,sha256=Jeyt0uFpyWBKY9jAZK1AJUXiwgPhm0cPyagfwmRYFYQ,1417
@@ -110,8 +127,9 @@ osducli/util/file.py,sha256=kfh6SLOI7X54gZ0hWF3kQ1npXPylNYgE1d1_w-fFyr0,1821
 osducli/util/prompt.py,sha256=0i3eNnxOHRQstvsvfiKnN0lIxXu6sEXIcU8txeYRhNs,7492
 osducli/util/pypi.py,sha256=-DW5CThkKKiOwLp2tg85BmrLKZzkMI9pu8DyWNPZH6E,1192
 osducli/util/service_info.py,sha256=YsVvoRoeG1osFjql2AgVkGoj1TePuhBZf3CQXl2a9As,2577
-osducli-0.0.46.dist-info/METADATA,sha256=YJ52g3cj_dupREqcePeYVd1wr_XnriE6e1t0qMKj3w8,6213
-osducli-0.0.46.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-osducli-0.0.46.dist-info/entry_points.txt,sha256=gASIcihV0BSJDZOUK-zTzb8RiccZCvKfVZMna9RsEIg,47
-osducli-0.0.46.dist-info/top_level.txt,sha256=lqiP5fuyH8lx7c2emYoIVZNxZAPX-bSwnMH789wxUAY,8
-osducli-0.0.46.dist-info/RECORD,,
+osducli-0.0.48.dist-info/licenses/LICENSE.md,sha256=9xnGPjJkOAgd0kH4QLlvOIYKqY1M49gWUQpoUxAU-9Y,12788
+osducli-0.0.48.dist-info/METADATA,sha256=trNPJ9A9g6b8DhVKQn1CqnnkFucTWw1TzEP6gxP0Ox0,6121
+osducli-0.0.48.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+osducli-0.0.48.dist-info/entry_points.txt,sha256=gASIcihV0BSJDZOUK-zTzb8RiccZCvKfVZMna9RsEIg,47
+osducli-0.0.48.dist-info/top_level.txt,sha256=lqiP5fuyH8lx7c2emYoIVZNxZAPX-bSwnMH789wxUAY,8
+osducli-0.0.48.dist-info/RECORD,,

osducli-0.0.48.dist-info/licenses/LICENSE.md

@@ -0,0 +1,231 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2021 Open Subsurface Data Universe Software / Platform / Data Flow / Data Loading
+
+   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.
+
+--------------------------------------------------------------------------------
+
+The files (license_verify.py, prompt.py, config.py, state.py, help_text_test.py, 
+test_prompt.py) are based upon code from https://github.com/Microsoft/knack and 
+are based upon the following license:
+
+Copyright (c) Microsoft Corporation
+
+All rights reserved. 
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the ""Software""), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.