From 4245e17fd40538cc01e88abadeb9af3c4bec9c19 Mon Sep 17 00:00:00 2001
From: kamangir <arash@kamangir.net>
Date: Sat, 20 Jul 2024 17:29:20 -0700
Subject: [PATCH] datacube query refactor - kamangir/bolt#746

---
 blue_geo/.abcli/datacube/firms_area/query.sh | 34 +++++++++-----------
 blue_geo/__init__.py                         |  2 +-
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/blue_geo/.abcli/datacube/firms_area/query.sh b/blue_geo/.abcli/datacube/firms_area/query.sh
index f78068b8..120d6238 100644
--- a/blue_geo/.abcli/datacube/firms_area/query.sh
+++ b/blue_geo/.abcli/datacube/firms_area/query.sh
@@ -5,7 +5,22 @@ function blue_geo_datacube_firms_area_query() {
 
     if [ $(abcli_option_int "$options" help 0) == 1 ]; then
         options="dryrun"
-        local args=$(blue_geo_datacube_firms_area_query_args)
+
+        local date=$(abcli_string_timestamp_short \
+            --include_time 0 \
+            --unique 0)
+        local area=$(python3 -m blue_geo.datacube.firms.area \
+            get \
+            --what area \
+            --delim \|)
+        local source=$(python3 -m blue_geo.datacube.firms.area \
+            get \
+            --what source \
+            --values 1 \
+            --delim \|)
+
+        local args="[--date $date]$ABCUL[--depth 1]$ABCUL[--area $area]$ABCUL[--source $source]$ABCUL[--log 1]"
+
         abcli_show_usage "@datacube query firms_area$ABCUL[$blue_geo_datacube_query_options]$ABCUL[-|<object-name>]$ABCUL[$options]$ABCUL$args" \
             "firms_area -query-> <object-name>."
         return
@@ -23,20 +38,3 @@ function blue_geo_datacube_firms_area_query() {
 
     return 0
 }
-
-function blue_geo_datacube_firms_area_query_args() {
-    local date=$(abcli_string_timestamp_short \
-        --include_time 0 \
-        --unique 0)
-    local area=$(python3 -m blue_geo.datacube.firms.area \
-        get \
-        --what area \
-        --delim \|)
-    local source=$(python3 -m blue_geo.datacube.firms.area \
-        get \
-        --what source \
-        --values 1 \
-        --delim \|)
-
-    echo "[--date $date]$ABCUL[--depth 1]$ABCUL[--area $area]$ABCUL[--source $source]$ABCUL[--log 1]"
-}
diff --git a/blue_geo/__init__.py b/blue_geo/__init__.py
index 731d1482..57443a77 100644
--- a/blue_geo/__init__.py
+++ b/blue_geo/__init__.py
@@ -4,7 +4,7 @@
 
 DESCRIPTION = f"{ICON} AI for precise geospatial data analysis and visualization."
 
-VERSION = "4.95.1"
+VERSION = "4.96.1"
 
 REPO_NAME = "blue-geo"