osducli 0.0.45__py3-none-any.whl → 0.0.47__py3-none-any.whl

osducli/VERSION

@@ -0,0 +1 @@
+0.0.47

osducli/__init__.py

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

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/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/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/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/version.py

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

{osducli-0.0.45.dist-info → osducli-0.0.47.dist-info}/METADATA

@@ -1,15 +1,14 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: osducli
-Version: 0.0.45
+Version: 0.0.47
 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
@@ -17,7 +16,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE.md
 Requires-Dist: click
 Requires-Dist: jmespath
-Requires-Dist: osdu-api[all]==0.28
+Requires-Dist: osdu-api[common]==1.0.3
 Requires-Dist: requests
 Requires-Dist: tabulate
 Requires-Dist: packaging
@@ -43,13 +42,14 @@ 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.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
 
@@ -81,6 +81,11 @@ 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
 ------
 

{osducli-0.0.45.dist-info → osducli-0.0.47.dist-info}/RECORD

@@ -1,10 +1,12 @@
-osducli/__init__.py,sha256=wchj1xeJep01vDg-LwBaAJ8nEesYQ8UP6klHacXfTaY,615
+osducli/VERSION,sha256=asCQlwEYNNa-OaZ02iRHVxP3qlng92XLRtgATrJAaTY,6
+osducli/__init__.py,sha256=J3RwqAbN7MWvz8vL24fMUar9Sfk8nMI8xq_aSHGXUy8,591
 osducli/__main__.py,sha256=4HonhahSaS3Un0f93qnbs_pmJ5pbbVHU-qdhsssVkB0,3661
-osducli/click_cli.py,sha256=7lpYqufxRSMrNZM9M-VANOYKwP0wo-1oxt2eSVHSW_M,10845
-osducli/cliclient.py,sha256=sUQyIiomrf-WIcFn9C6UjISvHANLjijI-SVLxQ3T2MY,13242
+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/log.py,sha256=a5pzV2QIOqFEWCGFj01FaZk9PEzMkAr6duHei_dCme8,1549
 osducli/state.py,sha256=b0GHH2oZ-4ogtmHenNkYwNRSE3OpSTL0XklbKVjUAKQ,3335
+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
@@ -74,7 +76,7 @@ osducli/commands/status/status.py,sha256=yh6KVUpNYbrLJIH-7GjMyo2MpR8Wvycr4KdkxUI
 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/delete.py,sha256=ElhE5fdC1yybG7BsVY9Li0x8TG1WeQpkraWWLCB_wR0,1612
+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
 osducli/commands/storage/list.py,sha256=bIN76XW70Xml0CCldNvjN-qCumqICjZkQPXs7LTY69M,1413
@@ -84,7 +86,7 @@ osducli/commands/unit/_const.py,sha256=GuBlXzsI723OKlqcBzsG21T44V_SbOPqdbaw8_c2c
 osducli/commands/unit/info.py,sha256=3mAB14C5256cDQGR_pUbSpKXN-0ohA7gxqxwq4t4VP8,1210
 osducli/commands/unit/list.py,sha256=-5yEk0RHNZudeaaRzzCQexUHR6kCYAzM60YaO0EujVI,1288
 osducli/commands/version/__init__.py,sha256=S8QUNV3WSGTJAWwzvPokDscvBP4m0BAwXV_JhSA0kD0,580
-osducli/commands/version/version.py,sha256=a_mpirlH5obnRhjUp9Ha4701Zj2rrU_NGQpQXRafHPY,4227
+osducli/commands/version/version.py,sha256=5Yc2e0IDlFJtbZvGWVSXFHBWtBO48K60KRZmpLGDjg4,4246
 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
@@ -109,9 +111,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.45.dist-info/LICENSE.md,sha256=9xnGPjJkOAgd0kH4QLlvOIYKqY1M49gWUQpoUxAU-9Y,12788
-osducli-0.0.45.dist-info/METADATA,sha256=duWD8sZg9w2B5bFsyARb37TdLRJVOJQOAhyRN4q4Lr4,6167
-osducli-0.0.45.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-osducli-0.0.45.dist-info/entry_points.txt,sha256=gASIcihV0BSJDZOUK-zTzb8RiccZCvKfVZMna9RsEIg,47
-osducli-0.0.45.dist-info/top_level.txt,sha256=lqiP5fuyH8lx7c2emYoIVZNxZAPX-bSwnMH789wxUAY,8
-osducli-0.0.45.dist-info/RECORD,,
+osducli-0.0.47.dist-info/licenses/LICENSE.md,sha256=9xnGPjJkOAgd0kH4QLlvOIYKqY1M49gWUQpoUxAU-9Y,12788
+osducli-0.0.47.dist-info/METADATA,sha256=sTxEF-cj6Hgtr6Oh0lZR2tdhE_WfRynUNylqt_HjE00,6260
+osducli-0.0.47.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+osducli-0.0.47.dist-info/entry_points.txt,sha256=gASIcihV0BSJDZOUK-zTzb8RiccZCvKfVZMna9RsEIg,47
+osducli-0.0.47.dist-info/top_level.txt,sha256=lqiP5fuyH8lx7c2emYoIVZNxZAPX-bSwnMH789wxUAY,8
+osducli-0.0.47.dist-info/RECORD,,

{osducli-0.0.45.dist-info → osducli-0.0.47.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any