osducli 0.0.52__tar.gz → 0.0.53__tar.gz

{osducli-0.0.52/src/osducli.egg-info → osducli-0.0.53}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osducli
-Version: 0.0.52
+Version: 0.0.53
 Summary: OSDU command line
 Author: OSDU Community
 License-Expression: Apache-2.0
@@ -75,6 +75,10 @@ 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

{osducli-0.0.52 → osducli-0.0.53}/README.rst

@@ -28,6 +28,10 @@ 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

osducli-0.0.53/src/osducli/VERSION

@@ -0,0 +1 @@
+0.0.53

{osducli-0.0.52 → osducli-0.0.53}/src/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-0.0.52 → osducli-0.0.53}/src/osducli/commands/search/query.py

@@ -12,18 +12,21 @@
 
 """Search service query command"""
 
-import collections
-
 import click
-from jmespath import Options
-from jmespath import compile as compile_jmespath
 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 = compile_jmespath("results[*].{Id:id,Kind:kind,CreateTime:createTime}")
-AGGREGATE_JMESPATH_EXPRESSION = compile_jmespath("sort_by(aggregations,&key)[*].{Key:key,Count:count}")
+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)
@@ -40,7 +43,7 @@ AGGREGATE_JMESPATH_EXPRESSION = compile_jmespath("sort_by(aggregations,&key)[*].
 )
 @click.option("-a", "--aggregate", "_aggr", help="Aggregate by element", required=False)
 @handle_cli_exceptions
-@command_with_output(None)
+@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)
@@ -71,9 +74,4 @@ def query(state: State, kind: str, identifier: str, custom_query: str, limit: in
 
     response = search_client.query_records(query_request=request_data)
     client.check_status_code(response)
-    response_data = response.json()
-
-    if aggregate is not None:
-        return AGGREGATE_JMESPATH_EXPRESSION.search(response_data, Options(collections.OrderedDict))
-
-    return QUERY_JMESPATH_EXPRESSION.search(response_data, Options(collections.OrderedDict))
+    return response.json()

{osducli-0.0.52 → osducli-0.0.53/src/osducli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: osducli
-Version: 0.0.52
+Version: 0.0.53
 Summary: OSDU command line
 Author: OSDU Community
 License-Expression: Apache-2.0
@@ -75,6 +75,10 @@ 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

osducli-0.0.52/src/osducli/VERSION

@@ -1 +0,0 @@
-0.0.52