osducli 0.0.44__tar.gz → 0.0.46__tar.gz

osducli-0.0.46/MANIFEST.in

@@ -0,0 +1 @@
+include VERSION

{osducli-0.0.44/src/osducli.egg-info → osducli-0.0.46}/PKG-INFO

@@ -1,23 +1,21 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: osducli
-Version: 0.0.44
+Version: 0.0.46
 Summary: OSDU command line
 Author-email: Equinor ASA <mhew@equinor.com>
-License: Apache-2.0
+License-Expression: Apache-2.0
 Project-URL: homepage, https://community.opengroup.org/osdu/platform/data-flow/data-loading/osdu-cli
 Project-URL: issue-tracker, https://community.opengroup.org/osdu/platform/data-flow/data-loading/osdu-cli/-/issues
 Keywords: osdu
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
-Classifier: License :: OSI Approved :: Apache Software License
 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[all]==0.28.0rc949
+Requires-Dist: osdu-api[common]==1.0.3
 Requires-Dist: requests
 Requires-Dist: tabulate
 Requires-Dist: packaging
@@ -33,8 +31,6 @@ Requires-Dist: google-cloud-storage
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: isort; extra == "dev"
-Requires-Dist: flake8; extra == "dev"
-Requires-Dist: pep8; extra == "dev"
 Requires-Dist: pylint; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
@@ -51,7 +47,7 @@ OSDU Command Line Interface
 
 Command-line interface for interacting with OSDU.
 
-NOTE: With version 0.0.41 and later the pip install command may need extra parameter since a dependency is not available from pypi.org:
+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
 
@@ -83,6 +79,16 @@ For more information, specify the `-h` flag:
 Change Log
 ==========
 
+0.0.46
+------
+- Simpler install command without extra-index-url
+- Fix error handling to get correct message details
+
+0.0.45
+------
+
+- Fix msal_non_interactive authentication
+
 0.0.44
 ------
 

{osducli-0.0.44 → osducli-0.0.46}/README.rst

@@ -3,7 +3,7 @@ OSDU Command Line Interface
 
 Command-line interface for interacting with OSDU.
 
-NOTE: With version 0.0.41 and later the pip install command may need extra parameter since a dependency is not available from pypi.org:
+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
 
@@ -35,6 +35,16 @@ For more information, specify the `-h` flag:
 Change Log
 ==========
 
+0.0.46
+------
+- Simpler install command without extra-index-url
+- Fix error handling to get correct message details
+
+0.0.45
+------
+
+- Fix msal_non_interactive authentication
+
 0.0.44
 ------
 

osducli-0.0.46/VERSION

@@ -0,0 +1 @@
+0.0.46

{osducli-0.0.44 → osducli-0.0.46}/pyproject.toml

@@ -1,12 +1,12 @@
 [build-system]
-requires = ["setuptools>=61.0", "wheel"]
+requires = ["setuptools>=80.4.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "osducli"
 dynamic = ["version", "readme"]
 description = "OSDU command line"
-license = { text = "Apache-2.0" }
+license = "Apache-2.0"
 requires-python = ">= 3.12"
 
 authors = [
@@ -16,7 +16,6 @@ authors = [
 classifiers = [
         "Development Status :: 3 - Alpha",
         "Environment :: Console",
-        "License :: OSI Approved :: Apache Software License",
         "Natural Language :: English",
         "Programming Language :: Python :: 3.13",
 ]
@@ -26,7 +25,7 @@ keywords = ["osdu"]
 dependencies = [
     "click",
     "jmespath",
-    "osdu-api[all]==0.28.0rc949",
+    "osdu-api[common]==1.0.3",
     "requests",
     "tabulate",
     "packaging",
@@ -54,8 +53,6 @@ dev = [
     "black",
     "isort",
     # linting
-    "flake8",
-    "pep8",
     "pylint",
     "ruff",
     # testing
@@ -73,14 +70,8 @@ dev = [
 [project.scripts]
 osdu = "osducli.__main__:main"
 
-[tool.setuptools.packages.find]
-where = ["src"]
-
-[tool.setuptools]
-py-modules = ["osducli"]
-
 [tool.setuptools.dynamic]
-version = {attr = "osducli.__VERSION__"}
+version = {file = "VERSION"}
 readme = {file = "README.rst"}
 
 [tool.nose2]
@@ -93,3 +84,18 @@ src = ["src"]
 [tool.ruff.lint]
 select = ["E", "F", "W", "I", "B", "UP"]
 ignore = ["E501"]
+
+[tool.pylint."messages control"]
+disable = [
+    "missing-docstring",
+    "protected-access",
+    "too-many-arguments",
+    "too-many-locals",
+    "too-many-branches",
+    "too-many-positional-arguments",
+    "format",
+    "fixme",
+    "unknown-option-value",
+    "unspecified-encoding",
+    "broad-exception-raised"
+]

{osducli-0.0.44 → osducli-0.0.46}/src/osducli/__init__.py

@@ -11,5 +11,3 @@
 #  limitations under the License.
 
 """ OSDU command line environment"""
-
-__VERSION__ = "0.0.44"

{osducli-0.0.44 → osducli-0.0.46}/src/osducli/auth/credentials.py

@@ -13,7 +13,6 @@
 
 import os
 
-from msal import ConfidentialClientApplication
 from osdu_api.providers.types import BaseCredentials
 
 from osducli.auth.aws_token_credential import AwsTokenCredential
@@ -47,13 +46,11 @@ def msal_non_interactive_credentials(config) -> BaseCredentials:
     authority = config.get("core", CONFIG_AUTHENTICATION_AUTHORITY, None)
     scopes = config.get("core", CONFIG_AUTHENTICATION_SCOPES, None)
     client_secret = config.get("core", CONFIG_CLIENT_SECRET, None)
-    app = ConfidentialClientApplication(client_id, client_secret, authority)
     credentials = MsalNonInteractiveCredential(
         client_id=client_id,
         client_secret=client_secret,
         authority=authority,
         scopes=scopes,
-        client=app,
     )
     return credentials
 

{osducli-0.0.44 → osducli-0.0.46}/src/osducli/auth/msal_non_interactive.py

@@ -21,14 +21,13 @@ logger = get_logger(__name__)
 class MsalNonInteractiveCredential(BaseCredentials):
     """Get token based client for connecting with OSDU."""
 
-    __access_token = None
+    _access_token = None
 
     def __init__(self,
                  client_id: str,
                  client_secret: str,
                  authority: str,
-                 scopes: str,
-                 client: ConfidentialClientApplication):
+                 scopes: str):
         """Setup the new client
 
         Args:
@@ -37,32 +36,26 @@ class MsalNonInteractiveCredential(BaseCredentials):
             scopes (str): scopes to request
         """
         super().__init__()
-        self._msal_confidential_client = client
         self._client_id = client_id
         self._client_secret = client_secret
         self._authority = authority
         self._scopes = scopes
+        self._app = ConfidentialClientApplication(
+            self._client_id, self._client_secret, self._authority
+        )
 
     @property
     def access_token(self) -> str:
-        return self.__access_token
+        return self._access_token
 
-    def refresh_token(self) -> str:   # pylint: disable=inconsistent-return-statements
+    def refresh_token(self) -> str:
         """
         return access_token.
         """
-        token = self._get_token()
-        if 'access_token' in token:
-            __access_token = token['access_token']
-            return __access_token
+        response = self._app.acquire_token_for_client(scopes=[self._scopes])
+        if 'access_token' in response:
+            self._access_token = response['access_token']
+        else:
+            raise Exception("Failed to aquire token")
 
-    def _get_token(self) -> dict:
-        """Get token using msal confidential client.
-
-         Returns:
-            dict: Dictionary representing the returned token
-        """
-        result = self._msal_confidential_client.acquire_token_silent([self._scopes], account=None)
-        if result:
-            return result
-        return self._msal_confidential_client.acquire_token_for_client([self._scopes])
+        return self._access_token

{osducli-0.0.44 → osducli-0.0.46}/src/osducli/click_cli.py

@@ -29,11 +29,11 @@ from jmespath import compile as compile_jmespath
 from packaging.version import Version
 from tabulate import tabulate
 
-import osducli
 from osducli.config import CLI_ENV_VAR_PREFIX, CLIConfig
 from osducli.log import get_logger
 from osducli.state import get_default_config, get_default_config_path
 from osducli.util.pypi import get_pypi_version
+from osducli.version import get_version
 
 
 class State:
@@ -103,7 +103,7 @@ class CustomMainClickGroup(CustomClickGroup):
         -   :meth:`format_epilog`
         """
         super().format_help(ctx, formatter)
-        current_version = osducli.__VERSION__
+        current_version = get_version()
         latest_version = get_pypi_version("osducli")
         if latest_version is not None and Version(current_version) < Version(latest_version):
             formatter.write_paragraph()

{osducli-0.0.44 → osducli-0.0.46}/src/osducli/cliclient.py

@@ -77,11 +77,7 @@ def handle_cli_exceptions(function):
         except HTTPError as ex:
             logger.error(MSG_HTTP_ERROR)
             logger.error("Error (%s) - %s", ex.response.status_code, ex.response.reason)
-            try:
-                error_content = ex.response.json()
-                logger.error("Message: %s", error_content.get("message"))
-            except json.JSONDecodeError:
-                logger.error("Response: %s", ex.response.content)
+            logger.error("Message: %s", get_error_message(ex.response))
         except CliError as ex:
             logger.error("Error %s", ex.message)
         except ValueError as ex:
@@ -93,6 +89,24 @@ def handle_cli_exceptions(function):
             )
         sys.exit(1)
 
+    def get_error_message(response: requests.Response) -> str:
+        try:
+            json_content = response.json()
+            if "error" in json_content:
+                error_data = json_content["error"]
+                if "message" in error_data:
+                    return error_data["message"]
+                if ("errors" in error_data
+                    and isinstance(error_data["errors"], list)
+                    and error_data["errors"]):
+                    first_error = error_data["errors"][0]
+                    if "message" in first_error:
+                        return first_error["message"]
+            # Fallback if the JSON structure doesn't match the expected pattern
+            return response.content
+        except json.JSONDecodeError:
+            return response.content
+
     return decorated
 
 

{osducli-0.0.44 → osducli-0.0.46}/src/osducli/commands/storage/delete.py

@@ -38,7 +38,7 @@ def delete(state: State, id: str):  # pylint: disable=invalid-name,redefined-bui
     client = CliOsduClient(state.config)
     record_client = client.get_storage_record_client()
     # TODO: Fix bug in SDK for DELETE. Workaround is to give bearer_token
-    response = record_client.delete_record(recordId=id, bearer_token=client.token_refresher.refresh_token())
+    response = record_client.delete_record(record_id=id, bearer_token=client.token_refresher.refresh_token())
     client.check_status_code(response, [200, 204])
 
     if state.is_user_friendly_mode():

{osducli-0.0.44 → osducli-0.0.46}/src/osducli/commands/version/version.py

@@ -19,7 +19,6 @@ import click
 from packaging.version import Version
 from requests.exceptions import RequestException
 
-import osducli
 from osducli.click_cli import CustomClickCommand, State, command_with_output
 from osducli.cliclient import CliOsduClient, handle_cli_exceptions
 from osducli.config import (
@@ -36,6 +35,7 @@ from osducli.config import (
 )
 from osducli.log import get_logger
 from osducli.util.pypi import get_pypi_version
+from osducli.version import get_version
 
 logger = get_logger(__name__)
 
@@ -74,7 +74,7 @@ def get_api_info(connection: CliOsduClient, config_url_key: str, url_extra_path:
 def version(state: State):
     """Print version information to standard system out."""
     if state.is_user_friendly_mode():
-        current_version = osducli.__VERSION__
+        current_version = get_version()
         latest_version = get_pypi_version("osducli")
         version_info = f"Installed OSDU Cli Version {current_version}\n"
         if latest_version is not None:

{osducli-0.0.44 → osducli-0.0.46}/src/osducli/commands/wellbore_ddms/_const.py

@@ -16,3 +16,4 @@ WELLBORE_DDMS_SERVICE_NAME = "Wellbore DDMS service"
 WELLBORE_DDMS_STATUS_PATH = "/about"
 WELLBORE_DDMS_SWAGGER_PATH = "https://community.opengroup.org/osdu/platform/domain-data-mgmt-services/wellbore/wellbore-domain-services/-/blob/master/spec/generated/openapi.json"  # noqa: E501
 WELLBORE_DDMS_DOCUMENTATION = "https://community.opengroup.org/osdu/platform/domain-data-mgmt-services/wellbore/wellbore-domain-services/-/tree/master"  # noqa: E501
+WELLBORE_DDMS_WELL_LOG_PATH = "/ddms/v3/welllogs"

osducli-0.0.46/src/osducli/commands/wellbore_ddms/well_log/add.py

@@ -0,0 +1,42 @@
+#  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.
+"""Well Log add record command"""
+import json
+
+import click
+
+from osducli.click_cli import CustomClickCommand, State, command_with_output
+from osducli.cliclient import CliOsduClient, handle_cli_exceptions
+from osducli.commands.wellbore_ddms._const import WELLBORE_DDMS_WELL_LOG_PATH
+
+
+# click entry point
+@click.command(cls=CustomClickCommand, help="Add Well Log record")
+@click.option("-f", "--file", "_file", help="WellLog record file to add", required=True)
+@handle_cli_exceptions
+@command_with_output("recordIds")
+def _click_command(state: State, _file: str):
+    return add_record(state, _file)
+
+
+def add_record(state: State, record_file: str):
+    """Add Well Log record"""
+    client = CliOsduClient(state.config)
+    wellbore_client = client.get_wellbore_ddms_client(url_extra_path=WELLBORE_DDMS_WELL_LOG_PATH)
+
+    with open(record_file) as file:
+        record_data = json.load(file)
+
+    record_data_list = "[" + json.dumps(record_data) + "]"
+    response = wellbore_client.create_well_log(record_data_list)
+    client.check_status_code(response)
+    return response.json()

osducli-0.0.46/src/osducli/commands/wellbore_ddms/well_log/data/__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 Well Log data commands"""

osducli-0.0.46/src/osducli/commands/wellbore_ddms/well_log/data/add.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.
+"""Well Log add data command"""
+import click
+
+from osducli.click_cli import CustomClickCommand, State, command_with_output
+from osducli.cliclient import CliOsduClient, handle_cli_exceptions
+from osducli.commands.wellbore_ddms._const import WELLBORE_DDMS_WELL_LOG_PATH
+
+
+# click entry point
+@click.command(cls=CustomClickCommand, help="Add Well Log data")
+@click.option("-id", "--id", "_id", help="WellLog id to add data to", required=True)
+@click.option("-f", "--file", "_file", help="WellLog data file to add", required=True)
+@handle_cli_exceptions
+@command_with_output("recordIds")
+def _click_command(state: State, _id: str, _file: str):
+    return add_data(state, _id, _file)
+
+
+def add_data(state: State, identifier: str, data_file: str):
+    """Well Log add data"""
+    client = CliOsduClient(state.config)
+    wellbore_client = client.get_wellbore_ddms_client(url_extra_path=WELLBORE_DDMS_WELL_LOG_PATH)
+
+    with open(data_file, 'rb') as file:
+        file_data = file.read()
+
+    response = wellbore_client.create_well_log_data(identifier, file_data)
+    client.check_status_code(response)
+    return response.json()

osducli-0.0.44/src/osducli/commands/wellbore_ddms/well_log/data.py → osducli-0.0.46/src/osducli/commands/wellbore_ddms/well_log/data/get.py

@@ -16,10 +16,11 @@ import click
 
 from osducli.click_cli import CustomClickCommand, State, command_with_output
 from osducli.cliclient import CliOsduClient, handle_cli_exceptions
+from osducli.commands.wellbore_ddms._const import WELLBORE_DDMS_WELL_LOG_PATH
 
 
 # click entry point
-@click.command(cls=CustomClickCommand)
+@click.command(cls=CustomClickCommand, help="Get Well Log data by id")
 @click.option("-id", "--id", "_id", help="WellLog id to search for", required=True)
 @click.option("-f", "--file", "_file", help="File to save WellLog data", required=True)
 @handle_cli_exceptions
@@ -28,14 +29,14 @@ def _click_command(state: State, _id: str, _file: str):
     return get_data(state, _id, _file)
 
 
-def get_data(state: State, identifier: str, _file: str):
+def get_data(state: State, identifier: str, out_file: str):
     """Get Well Log record by id"""
     client = CliOsduClient(state.config)
-    wellbore_client = client.get_wellbore_ddms_client(url_extra_path="/ddms/v3/welllogs")
+    wellbore_client = client.get_wellbore_ddms_client(url_extra_path=WELLBORE_DDMS_WELL_LOG_PATH)
     response = wellbore_client.get_well_log_data(identifier)
     client.check_status_code(response)
 
-    with open(_file, 'wb') as file:
+    with open(out_file, 'wb') as file:
         file.write(response.content)
 
     filename = os.path.abspath(file.name)

osducli-0.0.44/src/osducli/commands/wellbore_ddms/well_log/record.py → osducli-0.0.46/src/osducli/commands/wellbore_ddms/well_log/get.py

@@ -14,10 +14,11 @@ import click
 
 from osducli.click_cli import CustomClickCommand, State, command_with_output
 from osducli.cliclient import CliOsduClient, handle_cli_exceptions
+from osducli.commands.wellbore_ddms._const import WELLBORE_DDMS_WELL_LOG_PATH
 
 
 # click entry point
-@click.command(cls=CustomClickCommand)
+@click.command(cls=CustomClickCommand, help="Get Well Log record by id")
 @click.option("-id", "--id", "_id", help="WellLog id to search for", required=True)
 @handle_cli_exceptions
 @command_with_output()
@@ -28,7 +29,7 @@ def _click_command(state: State, _id: str):
 def get_record(state: State, identifier: str):
     """Get Well Log record by id"""
     client = CliOsduClient(state.config)
-    wellbore_client = client.get_wellbore_ddms_client(url_extra_path="/ddms/v3/welllogs")
+    wellbore_client = client.get_wellbore_ddms_client(url_extra_path=WELLBORE_DDMS_WELL_LOG_PATH)
     response = wellbore_client.get_well_log(identifier)
     client.check_status_code(response)
     return response.json()

osducli-0.0.46/src/osducli/version.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.
+
+
+def get_version():
+    with open("VERSION") as fh:
+        return fh.read().strip()

{osducli-0.0.44 → osducli-0.0.46/src/osducli.egg-info}/PKG-INFO

@@ -1,23 +1,21 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: osducli
-Version: 0.0.44
+Version: 0.0.46
 Summary: OSDU command line
 Author-email: Equinor ASA <mhew@equinor.com>
-License: Apache-2.0
+License-Expression: Apache-2.0
 Project-URL: homepage, https://community.opengroup.org/osdu/platform/data-flow/data-loading/osdu-cli
 Project-URL: issue-tracker, https://community.opengroup.org/osdu/platform/data-flow/data-loading/osdu-cli/-/issues
 Keywords: osdu
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
-Classifier: License :: OSI Approved :: Apache Software License
 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[all]==0.28.0rc949
+Requires-Dist: osdu-api[common]==1.0.3
 Requires-Dist: requests
 Requires-Dist: tabulate
 Requires-Dist: packaging
@@ -33,8 +31,6 @@ Requires-Dist: google-cloud-storage
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: isort; extra == "dev"
-Requires-Dist: flake8; extra == "dev"
-Requires-Dist: pep8; extra == "dev"
 Requires-Dist: pylint; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
@@ -51,7 +47,7 @@ OSDU Command Line Interface
 
 Command-line interface for interacting with OSDU.
 
-NOTE: With version 0.0.41 and later the pip install command may need extra parameter since a dependency is not available from pypi.org:
+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
 
@@ -83,6 +79,16 @@ For more information, specify the `-h` flag:
 Change Log
 ==========
 
+0.0.46
+------
+- Simpler install command without extra-index-url
+- Fix error handling to get correct message details
+
+0.0.45
+------
+
+- Fix msal_non_interactive authentication
+
 0.0.44
 ------
 

{osducli-0.0.44 → osducli-0.0.46}/src/osducli.egg-info/SOURCES.txt

@@ -1,5 +1,6 @@
-LICENSE.md
+MANIFEST.in
 README.rst
+VERSION
 pyproject.toml
 src/osducli/__init__.py
 src/osducli/__main__.py
@@ -8,6 +9,7 @@ src/osducli/cliclient.py
 src/osducli/config.py
 src/osducli/log.py
 src/osducli/state.py
+src/osducli/version.py
 src/osducli/wbddms_client.py
 src/osducli.egg-info/PKG-INFO
 src/osducli.egg-info/SOURCES.txt
@@ -98,8 +100,11 @@ src/osducli/commands/wellbore_ddms/__init__.py
 src/osducli/commands/wellbore_ddms/_const.py
 src/osducli/commands/wellbore_ddms/info.py
 src/osducli/commands/wellbore_ddms/well_log/__init__.py
-src/osducli/commands/wellbore_ddms/well_log/data.py
-src/osducli/commands/wellbore_ddms/well_log/record.py
+src/osducli/commands/wellbore_ddms/well_log/add.py
+src/osducli/commands/wellbore_ddms/well_log/get.py
+src/osducli/commands/wellbore_ddms/well_log/data/__init__.py
+src/osducli/commands/wellbore_ddms/well_log/data/add.py
+src/osducli/commands/wellbore_ddms/well_log/data/get.py
 src/osducli/commands/workflow/__init__.py
 src/osducli/commands/workflow/_const.py
 src/osducli/commands/workflow/get.py

{osducli-0.0.44 → osducli-0.0.46}/src/osducli.egg-info/requires.txt

@@ -1,6 +1,6 @@
 click
 jmespath
-osdu-api[all]==0.28.0rc949
+osdu-api[common]==1.0.3
 requests
 tabulate
 packaging
@@ -17,8 +17,6 @@ google-cloud-storage
 [dev]
 black
 isort
-flake8
-pep8
 pylint
 ruff
 pytest