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

osducli/__init__.py

@@ -12,4 +12,4 @@
 
 """ OSDU command line environment"""
 
-__VERSION__ = "0.0.44"
+__VERSION__ = "0.0.45"

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/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/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/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/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/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/commands/wellbore_ddms/well_log/{data.py → 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/commands/wellbore_ddms/well_log/{record.py → 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/util/file.py

@@ -11,8 +11,8 @@
 #  limitations under the License.
 
 import errno
-import os
 import glob
+import os
 
 
 def get_files_from_path(path: str) -> list:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: osducli
-Version: 0.0.44
+Version: 0.0.45
 Summary: OSDU command line
 Author-email: Equinor ASA <mhew@equinor.com>
 License: Apache-2.0
@@ -17,7 +17,7 @@ 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[all]==0.28
 Requires-Dist: requests
 Requires-Dist: tabulate
 Requires-Dist: packaging
@@ -33,8 +33,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"
@@ -83,6 +81,11 @@ For more information, specify the `-h` flag:
 Change Log
 ==========
 
+0.0.45
+------
+
+- Fix msal_non_interactive authentication
+
 0.0.44
 ------
 

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

@@ -1,4 +1,4 @@
-osducli/__init__.py,sha256=ibjJ0fg460aSRsjskiE_LSNoQ5I7qcPYsI5C1Z7MFxI,615
+osducli/__init__.py,sha256=wchj1xeJep01vDg-LwBaAJ8nEesYQ8UP6klHacXfTaY,615
 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
@@ -8,9 +8,9 @@ osducli/state.py,sha256=b0GHH2oZ-4ogtmHenNkYwNRSE3OpSTL0XklbKVjUAKQ,3335
 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
-osducli/auth/credentials.py,sha256=ScDrhx1ye1Ks9kbgQPozyeEZ3Id17wBsrMZuAF_ptpw,3329
+osducli/auth/credentials.py,sha256=ZhYHMmePr_vfzdcjc3UrEon8R26KYnZ9sfBLES6DLrA,3185
 osducli/auth/msal_interactive.py,sha256=IAoVIZJR7Q05GGdoXGtFBWC7CUe81olMZ4SANohXd1s,4313
-osducli/auth/msal_non_interactive.py,sha256=bebfSN7sfM1qslZsxwELF21GvWUbn_9B-l_PHOVEMGY,2289
+osducli/auth/msal_non_interactive.py,sha256=qgI1Gj0uZS5-ixypiV7fFY-hRo05SoZJB5YHmF1jCB8,1970
 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
@@ -86,11 +86,14 @@ osducli/commands/unit/list.py,sha256=-5yEk0RHNZudeaaRzzCQexUHR6kCYAzM60YaO0EujVI
 osducli/commands/version/__init__.py,sha256=S8QUNV3WSGTJAWwzvPokDscvBP4m0BAwXV_JhSA0kD0,580
 osducli/commands/version/version.py,sha256=a_mpirlH5obnRhjUp9Ha4701Zj2rrU_NGQpQXRafHPY,4227
 osducli/commands/wellbore_ddms/__init__.py,sha256=AvXe60cTMl2ptWH6-wjaODGpzOiQazUJ05yrBkSlXYo,583
-osducli/commands/wellbore_ddms/_const.py,sha256=aYid5h2KeFo8O8eytiDjnBYoxf1n8y6WWbWQ5vXUrj0,1034
+osducli/commands/wellbore_ddms/_const.py,sha256=XP4Cc19vBVG88N5qXDvPFhJEtSD4vKw05lnEwDTKRqM,1084
 osducli/commands/wellbore_ddms/info.py,sha256=Jeyt0uFpyWBKY9jAZK1AJUXiwgPhm0cPyagfwmRYFYQ,1417
 osducli/commands/wellbore_ddms/well_log/__init__.py,sha256=sKn5fM32pyXLNjqp3jqO90y_kdOFZXeDuXoZSCclEOU,592
-osducli/commands/wellbore_ddms/well_log/data.py,sha256=7BgbNOTJ5JjZM2N-cAWORPsga5wH7_jdtDX524dxmtc,1629
-osducli/commands/wellbore_ddms/well_log/record.py,sha256=FB-BHnrxcJydK33jAhrPgLva53JdxHCmZUFZt8KCbDk,1352
+osducli/commands/wellbore_ddms/well_log/add.py,sha256=zMVLuVKqqDnHt4acjlu0EjvKQOIlt4swgC-_7RyArm0,1638
+osducli/commands/wellbore_ddms/well_log/get.py,sha256=VLLWcXuv6QhQKvFUuIOxBtR-2I-FbLZTFnzMHeFnqF0,1472
+osducli/commands/wellbore_ddms/well_log/data/__init__.py,sha256=CxanltK0srKAjEyDez6ZVDCjs-UnwuvvGLvz8gdAc4o,597
+osducli/commands/wellbore_ddms/well_log/data/add.py,sha256=HUdU3SAySNEk1TfwcIe6pBxI0BTu-892kVhvp8U8yL8,1677
+osducli/commands/wellbore_ddms/well_log/data/get.py,sha256=ArEPF3deQXrA9ZjIE724QW-X9Zdg2mYjFyyLUKYzo1M,1753
 osducli/commands/workflow/__init__.py,sha256=hZZscXSv0oIpS93g7TvtNaSCaEMDr0ON5uBNh-s_8oc,586
 osducli/commands/workflow/_const.py,sha256=IQDjvu7TBd8L68TAF1qotf1wi0q5-DaNu87TFxwuAU8,696
 osducli/commands/workflow/get.py,sha256=BsiWYzCa-RFXCl-9piBqfxdN2dZ_e8lNQo7ZWMi51Ic,1498
@@ -102,13 +105,13 @@ osducli/commands/workflow/status.py,sha256=GNSaJrAHrCBjLkYDP0rYtsGicHsvZYLX5otLb
 osducli/commands/workflow/unregister.py,sha256=lTh7yoRE8Sb3W-03L2v16cs0G-0QtfNqFf8fg2t97o4,1415
 osducli/util/__init__.py,sha256=p2bZquIGOPfofHV6GIzWRUv_b9O_pIH5BTyv_gfQT6c,553
 osducli/util/exceptions.py,sha256=VVvJqxLLyYSsitwe9SVfsR7iPXIRaOJzOm7uCxfELjg,790
-osducli/util/file.py,sha256=866XSn7AWFXWgQ9B6OvPZVhb5p8VELbv_wOsUzc55-o,1821
+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.44.dist-info/LICENSE.md,sha256=9xnGPjJkOAgd0kH4QLlvOIYKqY1M49gWUQpoUxAU-9Y,12788
-osducli-0.0.44.dist-info/METADATA,sha256=_9Md40hzE-qk91awyx96oZ-Op-MnlE-FK98chhGP6lQ,6190
-osducli-0.0.44.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-osducli-0.0.44.dist-info/entry_points.txt,sha256=gASIcihV0BSJDZOUK-zTzb8RiccZCvKfVZMna9RsEIg,47
-osducli-0.0.44.dist-info/top_level.txt,sha256=lqiP5fuyH8lx7c2emYoIVZNxZAPX-bSwnMH789wxUAY,8
-osducli-0.0.44.dist-info/RECORD,,
+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.44.dist-info → osducli-0.0.45.dist-info}/WHEEL

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