bluer-objects 6.37.1__tar.gz → 6.46.1__tar.gz

{bluer_objects-6.37.1/bluer_objects.egg-info → bluer_objects-6.46.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bluer_objects
-Version: 6.37.1
+Version: 6.46.1
 Summary: 🌀 data objects for Bash.
 Home-page: https://github.com/kamangir/bluer-objects
 Author: Arash Abadpour (Kamangir)
@@ -53,6 +53,6 @@ Also home to [blue README](https://github.com/kamangir/bluer-objects/blob/main/b
 
 [![pylint](https://github.com/kamangir/bluer-objects/actions/workflows/pylint.yml/badge.svg)](https://github.com/kamangir/bluer-objects/actions/workflows/pylint.yml) [![pytest](https://github.com/kamangir/bluer-objects/actions/workflows/pytest.yml/badge.svg)](https://github.com/kamangir/bluer-objects/actions/workflows/pytest.yml) [![bashtest](https://github.com/kamangir/bluer-objects/actions/workflows/bashtest.yml/badge.svg)](https://github.com/kamangir/bluer-objects/actions/workflows/bashtest.yml) [![PyPI version](https://img.shields.io/pypi/v/bluer-objects.svg)](https://pypi.org/project/bluer-objects/) [![PyPI - Downloads](https://img.shields.io/pypi/dd/bluer-objects)](https://pypistats.org/packages/bluer-objects)
 
-built by 🌀 [`bluer_options-5.28.1`](https://github.com/kamangir/awesome-bash-cli), based on 🌀 [`bluer_objects-6.37.1`](https://github.com/kamangir/bluer-objects).
+built by 🌀 [`bluer_options-5.43.1`](https://github.com/kamangir/awesome-bash-cli), based on 🌀 [`bluer_objects-6.46.1`](https://github.com/kamangir/bluer-objects).
 
 built by 🌀 [`blueness-3.96.1`](https://github.com/kamangir/blueness).

{bluer_objects-6.37.1 → bluer_objects-6.46.1}/README.md

@@ -19,4 +19,4 @@ Also home to [blue README](./bluer_objects/README/).
 
 [![pylint](https://github.com/kamangir/bluer-objects/actions/workflows/pylint.yml/badge.svg)](https://github.com/kamangir/bluer-objects/actions/workflows/pylint.yml) [![pytest](https://github.com/kamangir/bluer-objects/actions/workflows/pytest.yml/badge.svg)](https://github.com/kamangir/bluer-objects/actions/workflows/pytest.yml) [![bashtest](https://github.com/kamangir/bluer-objects/actions/workflows/bashtest.yml/badge.svg)](https://github.com/kamangir/bluer-objects/actions/workflows/bashtest.yml) [![PyPI version](https://img.shields.io/pypi/v/bluer-objects.svg)](https://pypi.org/project/bluer-objects/) [![PyPI - Downloads](https://img.shields.io/pypi/dd/bluer-objects)](https://pypistats.org/packages/bluer-objects)
 
-built by 🌀 [`bluer_options-5.28.1`](https://github.com/kamangir/awesome-bash-cli), based on 🌀 [`bluer_objects-6.37.1`](https://github.com/kamangir/bluer-objects).
+built by 🌀 [`bluer_options-5.43.1`](https://github.com/kamangir/awesome-bash-cli), based on 🌀 [`bluer_objects-6.46.1`](https://github.com/kamangir/bluer-objects).

{bluer_objects-6.37.1 → bluer_objects-6.46.1}/bluer_objects/.abcli/alias.sh

@@ -19,7 +19,7 @@ alias @file=bluer_objects_file
 
 alias @host=bluer_objects_host
 
-alias @ls=bluer_ai_ls
+alias @ls=bluer_objects_ls
 
 alias @metadata=bluer_objects_metadata
 
@@ -29,8 +29,6 @@ alias @mysql=abcli_mysql
 
 alias @objects=bluer_objects
 
-alias @publish=bluer_ai_publish
-
 alias @select=bluer_ai_select
 
 alias @upload=bluer_objects_upload

bluer_objects-6.46.1/bluer_objects/.abcli/ls.sh

@@ -0,0 +1,18 @@
+#! /usr/bin/env bash
+
+function bluer_objects_ls() {
+    local options=$1
+    local where=$(abcli_option_choice "$options" cloud,local)
+
+    if [[ -z "$where" ]]; then
+        ls -1 "$@"
+    else
+        local object_name=$(abcli_clarify_object $2 .)
+
+        python3 -m bluer_objects.storage \
+            ls \
+            --object_name $object_name \
+            --where $where \
+            "${@:3}"
+    fi
+}

{bluer_objects-6.37.1 → bluer_objects-6.46.1}/bluer_objects/.abcli/storage/clear.sh

@@ -12,7 +12,7 @@ function bluer_ai_storage_clear() {
 
     local recent_filename=$ABCLI_OBJECT_ROOT/QGIS-recent.yaml
     if [[ ! -f "$recent_filename" ]]; then
-        abcli_log_warning "run \"QGIS.list_recent_projects\" first."
+        bluer_ai_log_warning "run \"QGIS.list_recent_projects\" first."
         return 1
     fi
 
@@ -30,7 +30,7 @@ function bluer_ai_storage_clear() {
         if [[ "+$recent_projects+" == *"+$object_name+"* ]]; then
             abcli_log "will keep $object_name ..."
         else
-            abcli_log_warning "will delete $object_name ..."
+            bluer_ai_log_warning "will delete $object_name ..."
 
             [[ "$do_dryrun" == 0 ]] &&
                 rm -rfv $object_name

{bluer_objects-6.37.1 → bluer_objects-6.46.1}/bluer_objects/.abcli/tests/help.sh

@@ -31,6 +31,8 @@ function test_bluer_objects_help() {
         \
         "@gif" \
         \
+        "@ls" \
+        \
         "@host" \
         "@host get" \
         "@host reboot" \
@@ -58,8 +60,6 @@ function test_bluer_objects_help() {
         "@mlflow test" \
         "@mlflow transition" \
         \
-        "@publish" \
-        \
         "@select" \
         \
         "@storage" \

bluer_objects-6.46.1/bluer_objects/.abcli/tests/ls.sh

@@ -0,0 +1,25 @@
+#! /usr/bin/env bash
+
+function test_bluer_objects_ls() {
+    local object_name=test_bluer_objects_ls-$(abcli_string_timestamp_short)
+
+    python3 -m bluer_objects.testing \
+        create_test_asset \
+        --object_name $object_name
+    [[ $? -ne 0 ]] && return 1
+    abcli_hr
+
+    bluer_objects_upload - $object_name
+    [[ $? -ne 0 ]] && return 1
+    abcli_hr
+
+    bluer_objects_ls cloud $object_name
+    [[ $? -ne 0 ]] && return 1
+    abcli_hr
+
+    bluer_objects_ls local $object_name
+    [[ $? -ne 0 ]] && return 1
+    abcli_hr
+
+    bluer_objects_ls $abcli_path_bash/tests/
+}

{bluer_objects-6.37.1 → bluer_objects-6.46.1}/bluer_objects/__init__.py

@@ -4,7 +4,7 @@ ICON = "🌀"
 
 DESCRIPTION = f"{ICON} data objects for Bash."
 
-VERSION = "6.37.1"
+VERSION = "6.46.1"
 
 REPO_NAME = "bluer-objects"
 

{bluer_objects-6.37.1 → bluer_objects-6.46.1}/bluer_objects/help/functions.py

@@ -6,6 +6,7 @@ from bluer_objects.help.clone import help_clone
 from bluer_objects.help.download import help_download
 from bluer_objects.help.gif import help_gif
 from bluer_objects.help.host import help_functions as help_host
+from bluer_objects.help.ls import help_ls
 from bluer_objects.help.metadata import help_functions as help_metadata
 from bluer_objects.help.mlflow import help_functions as help_mlflow
 from bluer_objects.help.upload import help_upload
@@ -19,6 +20,7 @@ help_functions.update(
         "download": help_download,
         "gif": help_gif,
         "host": help_host,
+        "ls": help_ls,
         "metadata": help_metadata,
         "mlflow": help_mlflow,
         "upload": help_upload,

bluer_objects-6.46.1/bluer_objects/help/ls.py

@@ -0,0 +1,40 @@
+from typing import List
+
+from bluer_options.terminal import show_usage
+
+
+def help_ls(
+    tokens: List[str],
+    mono: bool,
+) -> str:
+    args = [
+        "[--delim <space>]",
+        "[--log <0>]",
+    ]
+
+    usage_1 = show_usage(
+        [
+            "@ls",
+            "cloud | local",
+            "<object-name>",
+        ]
+        + args,
+        "ls <object-name>.",
+        mono=mono,
+    )
+
+    usage_2 = show_usage(
+        [
+            "@ls",
+            "<path>",
+        ],
+        "ls <path>.",
+        mono=mono,
+    )
+
+    return "\n".join(
+        [
+            usage_1,
+            usage_2,
+        ]
+    )

{bluer_objects-6.37.1 → bluer_objects-6.46.1}/bluer_objects/storage/WebDAV.py

@@ -1,3 +1,4 @@
+from typing import List, Tuple
 from webdav3.client import Client
 
 from bluer_objects.storage.base import StorageInterface
@@ -81,6 +82,13 @@ class WebDAVInterface(StorageInterface):
             log=log,
         )
 
+    def ls(
+        self,
+        object_name: str,
+        where: str = "local",
+    ) -> Tuple[bool, List[str]]:
+        assert False, "not implemented"
+
     def upload(
         self,
         object_name: str,

{bluer_objects-6.37.1 → bluer_objects-6.46.1}/bluer_objects/storage/WebDAVzip.py

@@ -1,3 +1,6 @@
+import glob
+import os
+from typing import Tuple, List
 from webdav3.client import Client
 
 from bluer_objects.storage.base import StorageInterface
@@ -60,6 +63,42 @@ class WebDAVzipInterface(StorageInterface):
             log=log,
         )
 
+    def ls(
+        self,
+        object_name: str,
+        where: str = "local",
+    ) -> Tuple[bool, List[str]]:
+        if where == "local":
+            object_path = objects.object_path(
+                object_name=object_name,
+            )
+
+            return True, [
+                os.path.relpath(filename, start=object_path)
+                for filename in glob.glob(
+                    os.path.join(
+                        object_path,
+                        "**",
+                        "*",
+                    ),
+                    recursive=True,
+                )
+                if os.path.isfile(filename)
+            ]
+
+        if where == "cloud":
+            try:
+                if self.client.check(remote_path=f"{object_name}.zip"):
+                    return True, [f"{object_name}.zip"]
+            except Exception as e:
+                logger.error(e)
+                return False, []
+
+            return True, []
+
+        logger.error(f"Unknown 'where': {where}")
+        return False, []
+
     def upload(
         self,
         object_name: str,

{bluer_objects-6.37.1 → bluer_objects-6.46.1}/bluer_objects/storage/__init__.py

@@ -1,3 +1,5 @@
+from typing import Tuple, List
+
 from bluer_objects.storage.base import StorageInterface
 from bluer_objects.storage.WebDAV import WebDAVInterface
 from bluer_objects.storage.WebDAVzip import WebDAVzipInterface
@@ -27,6 +29,16 @@ def download(
     )
 
 
+def ls(
+    object_name: str,
+    where: str = "local",
+) -> Tuple[bool, List[str]]:
+    return interface.ls(
+        object_name=object_name,
+        where=where,
+    )
+
+
 def upload(
     object_name: str,
     filename: str = "",

{bluer_objects-6.37.1 → bluer_objects-6.46.1}/bluer_objects/storage/__main__.py

@@ -13,7 +13,7 @@ parser = argparse.ArgumentParser(NAME)
 parser.add_argument(
     "task",
     type=str,
-    help="download | upload",
+    help="download | ls | upload",
 )
 parser.add_argument(
     "--object_name",
@@ -24,8 +24,26 @@ parser.add_argument(
     type=str,
     default="",
 )
+parser.add_argument(
+    "--where",
+    type=str,
+    default="local",
+    help="local | cloud",
+)
+parser.add_argument(
+    "--log",
+    type=int,
+    default=1,
+    help="0|1",
+)
+parser.add_argument(
+    "--delim",
+    type=str,
+    default=",",
+)
 args = parser.parse_args()
 
+delim = " " if args.delim == "space" else args.delim
 
 success = False
 if args.task == "download":
@@ -33,6 +51,21 @@ if args.task == "download":
         object_name=args.object_name,
         filename=args.filename,
     )
+elif args.task == "ls":
+    success, list_of_files = storage.ls(
+        object_name=args.object_name,
+        where=args.where,
+    )
+
+    if args.log:
+        logger.info(
+            "{:,} file(s).".format(len(list_of_files)),
+        )
+        for index, filename in enumerate(list_of_files):
+            logger.info(f"#{index+1: 4d} - {filename}")
+    else:
+        print(delim.join(list_of_files))
+
 elif args.task == "upload":
     success = storage.upload(
         object_name=args.object_name,

{bluer_objects-6.37.1 → bluer_objects-6.46.1}/bluer_objects/storage/base.py

@@ -1,3 +1,5 @@
+from typing import Tuple, List
+
 from bluer_objects.logger import logger
 
 
@@ -19,6 +21,13 @@ class StorageInterface:
 
         return True
 
+    def ls(
+        self,
+        object_name: str,
+        where: str = "local",
+    ) -> Tuple[bool, List[str]]:
+        return True, []
+
     def upload(
         self,
         object_name: str,

{bluer_objects-6.37.1 → bluer_objects-6.46.1/bluer_objects.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bluer_objects
-Version: 6.37.1
+Version: 6.46.1
 Summary: 🌀 data objects for Bash.
 Home-page: https://github.com/kamangir/bluer-objects
 Author: Arash Abadpour (Kamangir)
@@ -53,6 +53,6 @@ Also home to [blue README](https://github.com/kamangir/bluer-objects/blob/main/b
 
 [![pylint](https://github.com/kamangir/bluer-objects/actions/workflows/pylint.yml/badge.svg)](https://github.com/kamangir/bluer-objects/actions/workflows/pylint.yml) [![pytest](https://github.com/kamangir/bluer-objects/actions/workflows/pytest.yml/badge.svg)](https://github.com/kamangir/bluer-objects/actions/workflows/pytest.yml) [![bashtest](https://github.com/kamangir/bluer-objects/actions/workflows/bashtest.yml/badge.svg)](https://github.com/kamangir/bluer-objects/actions/workflows/bashtest.yml) [![PyPI version](https://img.shields.io/pypi/v/bluer-objects.svg)](https://pypi.org/project/bluer-objects/) [![PyPI - Downloads](https://img.shields.io/pypi/dd/bluer-objects)](https://pypistats.org/packages/bluer-objects)
 
-built by 🌀 [`bluer_options-5.28.1`](https://github.com/kamangir/awesome-bash-cli), based on 🌀 [`bluer_objects-6.37.1`](https://github.com/kamangir/bluer-objects).
+built by 🌀 [`bluer_options-5.43.1`](https://github.com/kamangir/awesome-bash-cli), based on 🌀 [`bluer_objects-6.46.1`](https://github.com/kamangir/bluer-objects).
 
 built by 🌀 [`blueness-3.96.1`](https://github.com/kamangir/blueness).

{bluer_objects-6.37.1 → bluer_objects-6.46.1}/bluer_objects.egg-info/SOURCES.txt

@@ -32,7 +32,6 @@ bluer_objects/.abcli/ls.sh
 bluer_objects/.abcli/metadata.sh
 bluer_objects/.abcli/mlflow.sh
 bluer_objects/.abcli/object.sh
-bluer_objects/.abcli/publish.sh
 bluer_objects/.abcli/select.sh
 bluer_objects/.abcli/storage.sh
 bluer_objects/.abcli/upload.sh
@@ -94,6 +93,7 @@ bluer_objects/help/download.py
 bluer_objects/help/functions.py
 bluer_objects/help/gif.py
 bluer_objects/help/host.py
+bluer_objects/help/ls.py
 bluer_objects/help/metadata.py
 bluer_objects/help/upload.py
 bluer_objects/help/mlflow/__init__.py

bluer_objects-6.37.1/bluer_objects/.abcli/ls.sh

@@ -1,24 +0,0 @@
-#! /usr/bin/env bash
-
-function bluer_ai_ls() {
-    local options=$1
-    local on_cloud=$(abcli_option_int "$options" cloud 0)
-    local on_local=$(abcli_option_int "$options" local 0)
-
-    [[ "$on_cloud" == 1 ]] ||
-        [[ "$on_local" == 1 ]] &&
-        local object_name=$(abcli_clarify_object $2 .)
-
-    if [ "$on_cloud" == 1 ]; then
-        abcli_eval - \
-            aws s3 ls $ABCLI_S3_OBJECT_PREFIX/$object_name/
-    elif [ "$on_local" == 1 ]; then
-        abcli_eval - \
-            ls -1lh $ABCLI_OBJECT_ROOT/$object_name
-    else
-        abcli_eval - \
-            ls -1 "$@"
-    fi
-
-    return 0
-}

bluer_objects-6.37.1/bluer_objects/.abcli/publish.sh

@@ -1,59 +0,0 @@
-#! /usr/bin/env bash
-
-function bluer_ai_publish() {
-    local options=$1
-    local do_download=$(abcli_option_int "$options" download 1)
-    local do_tar=$(abcli_option_int "$options" tar 0)
-    local prefix=$(abcli_option "$options" prefix)
-    local suffix=$(abcli_option "$options" suffix)
-
-    local object_name=$(abcli_clarify_object $2 .)
-    [[ "$do_download" == 1 ]] &&
-        bluer_objects_download - $object_name
-
-    bluer_objects_mlflow_tags set $object_name published
-
-    local public_object_name=$(abcli_option "$options" as $object_name)
-
-    if [ "$do_tar" == 1 ]; then
-        abcli_log "publishing $object_name -> $public_object_name.tar.gz"
-
-        bluer_objects_upload ~open,solid $object_name
-        aws s3 cp \
-            $ABCLI_S3_OBJECT_PREFIX/$object_name.tar.gz \
-            s3://$ABCLI_AWS_S3_PUBLIC_BUCKET_NAME/$public_object_name.tar.gz
-        aws s3 rm \
-            $ABCLI_S3_OBJECT_PREFIX/$object_name.tar.gz
-
-        abcli_log "🔗 $ABCLI_PUBLIC_PREFIX/$public_object_name.tar.gz"
-        return
-    fi
-
-    local object_path=$ABCLI_OBJECT_ROOT/$object_name
-
-    if [[ -z "$prefix$suffix" ]]; then
-        abcli_log "publishing $object_name -> $public_object_name"
-
-        aws s3 sync \
-            $object_path/ \
-            s3://$ABCLI_AWS_S3_PUBLIC_BUCKET_NAME/$public_object_name/
-
-        abcli_log "🔗 $ABCLI_PUBLIC_PREFIX/$public_object_name/"
-        return
-    fi
-
-    abcli_log "publishing $object_name/$prefix*$suffix -> $public_object_name"
-
-    pushd $object_path >/dev/null
-    local filename
-    for filename in $(ls *); do
-        [[ "$filename" != "$prefix"*"$suffix" ]] && continue
-
-        aws s3 cp \
-            $filename \
-            s3://$ABCLI_AWS_S3_PUBLIC_BUCKET_NAME/$public_object_name/$filename
-
-        abcli_log "🔗 $ABCLI_PUBLIC_PREFIX/$public_object_name/$filename"
-    done
-    popd >/dev/null
-}

bluer_objects-6.37.1/bluer_objects/.abcli/tests/ls.sh

@@ -1,13 +0,0 @@
-#! /usr/bin/env bash
-
-function test_bluer_objects_ls() {
-    bluer_ai_select
-
-    bluer_objects_upload
-
-    bluer_ai_ls cloud
-
-    bluer_ai_ls local
-
-    bluer_ai_ls "$abcli_path_bash/tests/*.sh"
-}