Datacube refactor - kamangir/bolt#746

blue_geo/.abcli/datacube/get.sh

@@ -19,15 +19,21 @@ function blue_geo_datacube_get() {
 
     if [[ "$what" == "catalog" ]]; then
         local object_name=$(abcli_clarify_object $2 .)
-        extra_args="--object_name $object_name ${@:3}"
+        python3 -m blue_geo.datacube \
+            get \
+            --what "$what" \
+            --object_name $object_name \
+            "${@:3}"
     elif [[ "$what" == "template" ]]; then
-        extra_args="--catalog $2 ${@:3}"
+        python3 -m blue_geo.datacube \
+            get \
+            --what "$what" \
+            --catalog "$2" \
+            "${@:3}"
     else
-        extra_args="${@:2}"
+        python3 -m blue_geo.datacube \
+            get \
+            --what "$what" \
+            "${@:2}"
     fi
-
-    python3 -m blue_geo.datacube \
-        get \
-        --what "$what" \
-        "$extra_args"
 }

blue_geo/.abcli/datacube/ingest.sh

@@ -32,7 +32,7 @@ function blue_geo_datacube_ingest() {
 
     [[ "$do_copy_template" == 1 ]] &&
         abcli_clone \
-            $BLUE_GEO_FIRMS_QGIS_TEMPLATE \
+            $template_object_name \
             $object_name \
             ~meta
 

blue_geo/__init__.py

@@ -4,7 +4,7 @@
 
 DESCRIPTION = f"{ICON} AI for precise geospatial data analysis and visualization."
 
-VERSION = "4.99.1"
+VERSION = "4.100.1"
 
 REPO_NAME = "blue-geo"
 

blue_geo/config.env

@@ -1,3 +1,3 @@
 BLUE_GEO_UKRAINE_TIMEMAP_QGIS_TEMPLATE=ukraine-timemap-template-v11
 
-BLUE_GEO_FIRMS_QGIS_TEMPLATE=firms-template-v1
+BLUE_GEO_FIRMS_AREA_QGIS_TEMPLATE=firms-template-v1

blue_geo/datacube/__main__.py

@@ -1,15 +1,17 @@
 import argparse
 from blue_geo import VERSION
 from blue_geo.datacube.catalogs import list_of
-from blue_geo.ukraine_timemap import NAME
+from blue_geo import env
+from blue_geo.datacube.catalogs import catalog_of
+from blue_geo.datacube import NAME
 from blue_geo.logger import logger
 from blueness.argparse.generic import sys_exit
 
 parser = argparse.ArgumentParser(NAME, description=f"{NAME}-{VERSION}")
 parser.add_argument(
     "task",
     type=str,
-    help="list_of_catalogs",
+    help="get|list_of_catalogs",
 )
 parser.add_argument(
     "--delim",
@@ -22,12 +24,37 @@
     type=int,
     help="0|1",
 )
+parser.add_argument(
+    "--what",
+    default="",
+    type=str,
+    help="catalog|template",
+)
+parser.add_argument(
+    "--object_name",
+    type=str,
+    default="",
+)
+parser.add_argument(
+    "--catalog",
+    type=str,
+    default="",
+)
 args = parser.parse_args()
 
 delim = " " if args.delim == "space" else args.delim
 
 success = False
-if args.task == "list_of_catalogs":
+if args.task == "get":
+    success = True
+    output = f"unknown-{args.what}"
+    if args.what == "template":
+        output = env.QGIS_TEMPLATES.get(args.catalog, output)
+    elif args.what == "catalog":
+        _, output = catalog_of(datacube_id=args.object_name)
+
+    print(output)
+elif args.task == "list_of_catalogs":
     success = True
     output = list_of
 

blue_geo/datacube/catalogs.py

@@ -1,3 +1,21 @@
+from typing import Tuple, List
+from blue_geo.datacube.generic import GenericDatacube
 from blue_geo.datacube.firms.area import FirmsAreaDatacube
 
-list_of = [FirmsAreaDatacube.catalog]
+
+list_of_datacube_classes: List[GenericDatacube] = [
+    FirmsAreaDatacube,
+]
+
+list_of = list(
+    set([datacube_class.catalog for datacube_class in list_of_datacube_classes])
+)
+
+
+def catalog_of(datacube_id: str) -> Tuple[bool, str]:
+    for datacube_class in list_of_datacube_classes:
+        success, _ = datacube_class.parse_datacube_id(datacube_id)
+        if success:
+            return True, datacube_class.catalog
+
+    return False, "unknown-catalog"

blue_geo/datacube/firms/area/classes.py

@@ -80,27 +80,27 @@ def parse_datacube_id(cls, datacube_id: str) -> Tuple[
 
         # datacube-firm_area-<area>-<source>
         pieces = datacube_id.split("-")
-        if len(pieces) < 6:
+        if len(pieces) < 8:
             return False, {}
 
-        area_str = pieces[2].upper
-        if area_str not in Area.values:
+        area_str = pieces[2]
+        if area_str not in Area.values():
             return False, {}
 
         source_str = pieces[3]
-        if source_str not in Source.values:
+        if source_str not in Source.values():
             return False, {}
 
-        date = pieces[4]
+        date = "{}-{}-{}".format(pieces[4], pieces[5], pieces[6])
 
-        depth_str = pieces[5]
+        depth_str = pieces[7]
         if not depth_str.isdigit():
             return False, {}
 
         return (
             True,
             {
-                "area": Area[area_str],
+                "area": Area[area_str.upper()],
                 "source": Source[source_str],
                 "date": date,
                 "depth": int(depth_str),

blue_geo/datacube/generic.py

@@ -41,9 +41,6 @@ def parse_datacube_id(cls, datacube_id: str) -> Tuple[
         pieces = datacube_id.split("-") + ["", ""]
 
         return (
-            all(
-                pieces[0] == "datacube",
-                pieces[1] == cls.catalog,
-            ),
+            pieces[0] == "datacube" and pieces[1] == cls.catalog,
             {},
         )

blue_geo/env.py

@@ -9,9 +9,13 @@
     "BLUE_GEO_UKRAINE_TIMEMAP_QGIS_TEMPLATE", ""
 )
 
-BLUE_GEO_FIRMS_QGIS_TEMPLATE = os.getenv(
-    "BLUE_GEO_FIRMS_QGIS_TEMPLATE",
+BLUE_GEO_FIRMS_AREA_QGIS_TEMPLATE = os.getenv(
+    "BLUE_GEO_FIRMS_AREA_QGIS_TEMPLATE",
     "",
 )
 
 FIRMS_MAP_KEY = os.getenv("FIRMS_MAP_KEY", "")
+
+QGIS_TEMPLATES = {
+    "firms_area": BLUE_GEO_FIRMS_AREA_QGIS_TEMPLATE,
+}

blue_geo/tests/test_env.py

@@ -8,5 +8,5 @@ def test_abcli_env():
 
 def test_blue_geo_env():
     assert env.BLUE_GEO_UKRAINE_TIMEMAP_QGIS_TEMPLATE
-    assert env.BLUE_GEO_FIRMS_QGIS_TEMPLATE
+    assert env.BLUE_GEO_FIRMS_AREA_QGIS_TEMPLATE
     assert env.FIRMS_MAP_KEY