osducli 0.0.51__tar.gz → 0.0.52__tar.gz

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

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: osducli
-Version: 0.0.51
+Version: 0.0.52
 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,10 @@ For more information, specify the `-h` flag:
 Change Log
 ==========
 
+0.0.52
+------
+- Fix result for aggregate in search command
+
 0.0.51
 ------
 - Get record version command

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

@@ -28,6 +28,10 @@ For more information, specify the `-h` flag:
 Change Log
 ==========
 
+0.0.52
+------
+- Fix result for aggregate in search command
+
 0.0.51
 ------
 - Get record version command

{osducli-0.0.51 → osducli-0.0.52}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=80.9.0", "wheel"]
+requires = ["setuptools>=80.10.1", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -7,10 +7,10 @@ name = "osducli"
 dynamic = ["version", "readme"]
 description = "OSDU command line"
 license = "Apache-2.0"
-requires-python = ">= 3.12"
+requires-python = ">= 3.13"
 
 authors = [
-    { name = "Equinor ASA", email = "mhew@equinor.com" }
+    { name = "OSDU Community"}
 ]
 
 classifiers = [

osducli-0.0.52/src/osducli/VERSION

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

{osducli-0.0.51 → osducli-0.0.52}/src/osducli/commands/search/query.py

@@ -12,12 +12,18 @@
 
 """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}")
 
 # click entry point
 @click.command(cls=CustomClickCommand)
@@ -34,7 +40,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(None)
 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)
@@ -65,4 +71,9 @@ 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)
-    return response.json()
+    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))

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

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: osducli
-Version: 0.0.51
+Version: 0.0.52
 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,10 @@ For more information, specify the `-h` flag:
 Change Log
 ==========
 
+0.0.52
+------
+- Fix result for aggregate in search command
+
 0.0.51
 ------
 - Get record version command

osducli-0.0.51/src/osducli/VERSION

@@ -1 +0,0 @@
-0.0.51