osducli 0.0.51__py3-none-any.whl → 0.0.53__py3-none-any.whl

osducli/VERSION

@@ -1 +1 @@
-0.0.51
+0.0.53

osducli/click_cli.py

@@ -187,6 +187,15 @@ def global_params(func):
     return wrapper
 
 
+def _apply_jmespath(result, jmes):
+    try:
+        query_expression = compile_jmespath(jmes)
+        return query_expression.search(result, Options(collections.OrderedDict))
+    except KeyError as ex:
+        # Raise a ValueError which argparse can handle
+        raise ValueError from ex
+
+
 def command_with_output(table_transformer=None):
     """Handle global parameters setting to setup state and remove parameters from those passed
     to the decorated function call."""
@@ -227,18 +236,13 @@ def command_with_output(table_transformer=None):
             result = func(*args, **kwargs)
             if result is not None:
                 if type(result) in [dict, list]:
-                    if state.jmes is not None or (
-                        table_transformer is not None and state.output is None
-                    ):
-                        jmes = state.jmes if state.jmes is not None else table_transformer
-                        try:
-                            query_expression = compile_jmespath(jmes)
-                            result = query_expression.search(
-                                result, Options(collections.OrderedDict)
-                            )
-                        except KeyError as ex:
-                            # Raise a ValueError which argparse can handle
-                            raise ValueError from ex
+                    transformer = table_transformer
+                    if callable(transformer):
+                        transformer = transformer(*args, **kwargs)
+
+                    if state.jmes is not None or (transformer is not None and state.output is None):
+                        jmes = state.jmes if state.jmes is not None else transformer
+                        result = _apply_jmespath(result, jmes)
 
                     if state.output == "json":
                         print(json.dumps(result, indent=2))

osducli/commands/search/query.py

@@ -18,6 +18,15 @@ from osdu_api.model.search.query_request import QueryRequest
 from osducli.click_cli import CustomClickCommand, State, command_with_output
 from osducli.cliclient import CliOsduClient, handle_cli_exceptions
 
+QUERY_JMESPATH_EXPRESSION = "results[*].{Id:id,Kind:kind,CreateTime:createTime}"
+AGGREGATE_JMESPATH_EXPRESSION = "sort_by(aggregations,&key)[*].{Key:key,Count:count}"
+
+
+def _default_query_jmespath(*args, **kwargs):
+    aggregate = kwargs.get("_aggr")
+    if aggregate is None and len(args) >= 6:
+        aggregate = args[5]
+    return AGGREGATE_JMESPATH_EXPRESSION if aggregate else QUERY_JMESPATH_EXPRESSION
 
 # click entry point
 @click.command(cls=CustomClickCommand)
@@ -34,7 +43,7 @@ from osducli.cliclient import CliOsduClient, handle_cli_exceptions
 )
 @click.option("-a", "--aggregate", "_aggr", help="Aggregate by element", required=False)
 @handle_cli_exceptions
-@command_with_output("results[*].{Id:id,Kind:kind,CreateTime:createTime}")
+@command_with_output(_default_query_jmespath)
 def _click_command(state: State, kind: str, _id: str, _query: str, limit: int, _aggr: str):
     """Search using more advanced query terms"""
     return query(state, kind, _id, _query, limit, _aggr)

{osducli-0.0.51.dist-info → osducli-0.0.53.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: osducli
-Version: 0.0.51
+Version: 0.0.53
 Summary: OSDU command line
-Author-email: Equinor ASA <mhew@equinor.com>
+Author: OSDU Community
 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
@@ -11,7 +11,7 @@ Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.12
+Requires-Python: >=3.13
 Description-Content-Type: text/x-rst
 License-File: LICENSE.md
 Requires-Dist: click
@@ -75,6 +75,14 @@ For more information, specify the `-h` flag:
 Change Log
 ==========
 
+0.0.53
+------
+- Fix json formatting for search query command
+
+0.0.52
+------
+- Fix result for aggregate in search command
+
 0.0.51
 ------
 - Get record version command

{osducli-0.0.51.dist-info → osducli-0.0.53.dist-info}/RECORD

@@ -1,7 +1,7 @@
-osducli/VERSION,sha256=pKLYb8I7W-9_9iuPirYhJ9jzAkpo28gEuYMDA0g7API,6
+osducli/VERSION,sha256=EvrjPj9Un2g-BN93GmiTlrqsVf4F7bokReAVfyALC3g,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/click_cli.py,sha256=0lZeUAeoJ2MbgWu_nJP7inr16ceUKRo382J4KcoZxPI,10888
 osducli/cliclient.py,sha256=u1pF5wYK1OmboGQld6cLsVXsSr0Fau000dZjvsW-yK0,13872
 osducli/config.py,sha256=OSsUK2UNiEYL_ikpAKkJhpodxMYMw39mEhav5IoUfRo,7873
 osducli/log.py,sha256=a5pzV2QIOqFEWCGFj01FaZk9PEzMkAr6duHei_dCme8,1549
@@ -70,7 +70,7 @@ osducli/commands/search/_const.py,sha256=YYTZd35Z9O0gEf6kb9Ntonvv3qArkAcszKAq2VA
 osducli/commands/search/id.py,sha256=1tVbgpDRhW08gyaLfQbCZjFrQDUGPh8gupf7pNhiN6c,1909
 osducli/commands/search/info.py,sha256=j6cjYDbxiiQEKXs0LJGQ_0scKReCGi6iQJrfn2X0B20,1333
 osducli/commands/search/kind.py,sha256=9vGVp4QG4dTII4LGcLYKDAE2PmcB-isgiCfwiITVauU,1786
-osducli/commands/search/query.py,sha256=nZkOyhz0dTKEHCvICkyeEkfph4Wd6O_p51GTzJg1lEY,2606
+osducli/commands/search/query.py,sha256=GMOr2Lug_6nehKeQ8GeyUzcPWION-Vb11VKaoL_u7Vs,2986
 osducli/commands/status/__init__.py,sha256=5g1PB_tU0sqP7aplnihjfhMzVVQdlB3Y01QIeHAtSMw,595
 osducli/commands/status/status.py,sha256=yh6KVUpNYbrLJIH-7GjMyo2MpR8Wvycr4KdkxUI1V5A,4543
 osducli/commands/storage/__init__.py,sha256=Ilc97Kje3VVLZIBJucd_2jsW1GF5En00xF-A6kiLAFM,585
@@ -236,9 +236,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.51.dist-info/licenses/LICENSE.md,sha256=9xnGPjJkOAgd0kH4QLlvOIYKqY1M49gWUQpoUxAU-9Y,12788
-osducli-0.0.51.dist-info/METADATA,sha256=QUUwGY12jCAaYkGbOiLNJjS0IniEkQS_sQ_aSe0Z9xM,6326
-osducli-0.0.51.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-osducli-0.0.51.dist-info/entry_points.txt,sha256=gASIcihV0BSJDZOUK-zTzb8RiccZCvKfVZMna9RsEIg,47
-osducli-0.0.51.dist-info/top_level.txt,sha256=lqiP5fuyH8lx7c2emYoIVZNxZAPX-bSwnMH789wxUAY,8
-osducli-0.0.51.dist-info/RECORD,,
+osducli-0.0.53.dist-info/licenses/LICENSE.md,sha256=9xnGPjJkOAgd0kH4QLlvOIYKqY1M49gWUQpoUxAU-9Y,12788
+osducli-0.0.53.dist-info/METADATA,sha256=yJog5mj33V7yYD0nrnpGDd7Rqk-el22HNuQ00iEGRyw,6426
+osducli-0.0.53.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+osducli-0.0.53.dist-info/entry_points.txt,sha256=gASIcihV0BSJDZOUK-zTzb8RiccZCvKfVZMna9RsEIg,47
+osducli-0.0.53.dist-info/top_level.txt,sha256=lqiP5fuyH8lx7c2emYoIVZNxZAPX-bSwnMH789wxUAY,8
+osducli-0.0.53.dist-info/RECORD,,

{osducli-0.0.51.dist-info → osducli-0.0.53.dist-info}/WHEEL

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