bluer-objects 6.192.1__tar.gz → 6.202.1__tar.gz

{bluer_objects-6.192.1/bluer_objects.egg-info → bluer_objects-6.202.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bluer_objects
-Version: 6.192.1
+Version: 6.202.1
 Summary: 🌀 Object management in Bash.
 Home-page: https://github.com/kamangir/bluer-objects
 Author: Arash Abadpour (Kamangir)
@@ -64,6 +64,6 @@ pip install bluer-objects
 
 [![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 README`](https://github.com/kamangir/bluer-objects/tree/main/bluer_objects/README), based on 🌀 [`bluer_objects-6.192.1`](https://github.com/kamangir/bluer-objects).
+built by 🌀 [`bluer README`](https://github.com/kamangir/bluer-objects/tree/main/bluer_objects/README), based on 🌀 [`bluer_objects-6.202.1`](https://github.com/kamangir/bluer-objects).
 
 built by 🌀 [`blueness-3.118.1`](https://github.com/kamangir/blueness).

{bluer_objects-6.192.1 → bluer_objects-6.202.1}/README.md

@@ -30,4 +30,4 @@ pip install bluer-objects
 
 [![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 README`](https://github.com/kamangir/bluer-objects/tree/main/bluer_objects/README), based on 🌀 [`bluer_objects-6.192.1`](https://github.com/kamangir/bluer-objects).
+built by 🌀 [`bluer README`](https://github.com/kamangir/bluer-objects/tree/main/bluer_objects/README), based on 🌀 [`bluer_objects-6.202.1`](https://github.com/kamangir/bluer-objects).

{bluer_objects-6.192.1 → bluer_objects-6.202.1}/bluer_objects/.abcli/tests/storage_public_upload.sh

@@ -11,8 +11,15 @@ function test_bluer_objects_storage_public_upload() {
         $object_name \
         --depth 1
     [[ $? -ne 0 ]] && return 1
+    bluer_ai_hr
 
     bluer_objects_upload \
         public \
         $object_name
+    [[ $? -ne 0 ]] && return 1
+    bluer_ai_hr
+
+    bluer_objects_upload \
+        public,zip \
+        $object_name
 }

{bluer_objects-6.192.1 → bluer_objects-6.202.1}/bluer_objects/.abcli/tests/storage_upload_download.sh

@@ -8,7 +8,8 @@ function test_bluer_objects_storage_upload_download() {
     mkdir -pv $object_path
 
     bluer_objects_create_test_asset \
-        $object_name
+        $object_name \
+        --depth 1
     [[ $? -ne 0 ]] && return 1
     bluer_ai_hr
 
@@ -59,4 +60,10 @@ function test_bluer_objects_storage_upload_download() {
     bluer_objects_download \
         - \
         $object_name
+    [[ $? -ne 0 ]] && return 1
+    bluer_ai_hr
+
+    bluer_objects_upload \
+        zip \
+        $object_name
 }

{bluer_objects-6.192.1 → bluer_objects-6.202.1}/bluer_objects/.abcli/upload.sh

@@ -4,12 +4,34 @@ function bluer_objects_upload() {
     local options=$1
     local filename=$(bluer_ai_option "$options" filename)
     local public=$(bluer_ai_option_int "$options" public 0)
+    local do_zip=$(bluer_ai_option_int "$options" zip 0)
 
     local object_name=$(bluer_ai_clarify_object $2 .)
     local object_path=$ABCLI_OBJECT_ROOT/$object_name
 
     rm -rf $object_path/auxiliary
 
+    if [[ "$do_zip" == 1 ]]; then
+        local zip_filename=$ABCLI_OBJECT_ROOT/$object_name.tar.gz
+
+        [[ -f "$zip_filename" ]] &&
+            rm -v $zip_filename
+
+        bluer_ai_eval - \
+            tar -czvf \
+            $zip_filename \
+            -C $ABCLI_OBJECT_ROOT $object_name
+        [[ $? -ne 0 ]] && return 1
+
+        python3 -m bluer_objects.storage \
+            upload \
+            --object_name $object_name \
+            --zip 1 \
+            --public $public
+
+        return
+    fi
+
     python3 -m bluer_objects.storage \
         upload \
         --object_name $object_name \

{bluer_objects-6.192.1 → bluer_objects-6.202.1}/bluer_objects/README/functions.py

@@ -6,7 +6,7 @@ from blueness import module
 
 from bluer_objects import NAME as MY_NAME, ICON as MY_ICON
 from bluer_objects.metadata import get_from_object
-from bluer_objects import file
+from bluer_objects import file, env
 from bluer_objects import markdown
 from bluer_objects.logger import logger
 
@@ -148,9 +148,10 @@ def build(
                 template_line = " ".join(
                     [
                         (
-                            "[{}]({}/{}.tar.gz)".format(
+                            "[{}](https://{}.{}/{}.tar.gz)".format(
                                 token.split(":::")[1].strip(),
-                                "TBA",
+                                env.S3_PUBLIC_STORAGE_BUCKET,
+                                env.S3_STORAGE_ENDPOINT_URL.split("https://", 1)[1],
                                 token.split(":::")[1].strip(),
                             )
                             if token.startswith("object:::")

{bluer_objects-6.192.1 → bluer_objects-6.202.1}/bluer_objects/__init__.py

@@ -4,7 +4,7 @@ ICON = "🌀"
 
 DESCRIPTION = f"{ICON} Object management in Bash."
 
-VERSION = "6.192.1"
+VERSION = "6.202.1"
 
 REPO_NAME = "bluer-objects"
 

{bluer_objects-6.192.1 → bluer_objects-6.202.1}/bluer_objects/help/upload.py

@@ -10,7 +10,7 @@ def help_upload(
     options = "".join(
         [
             "filename=<filename>",
-            xtra(",public", mono=mono),
+            xtra(",public,zip", mono=mono),
         ]
     )
 

bluer_objects-6.202.1/bluer_objects/logger/image.py

@@ -0,0 +1,91 @@
+import matplotlib.pyplot as plt
+from typing import Dict, Any, Union, List
+import pandas as pd
+import random
+import os
+
+from bluer_objects import file, objects
+from bluer_objects.graphics.signature import sign_filename
+
+
+def log_image_grid(
+    items: Union[
+        Dict[str, Dict[str, Any]],
+        pd.DataFrame,
+    ],
+    filename: str,
+    rows: int = 3,
+    cols: int = 5,
+    log: bool = True,
+    scale: int = 2,
+    shuffle: bool = False,
+    header: List[str] = [],
+    footer: List[str] = [],
+    relative_path: bool = False,
+) -> bool:
+    if isinstance(items, pd.DataFrame):
+        items = items.to_dict("records")
+
+    while len(items) < rows * cols:
+        items += [{"pass": True}]
+    if shuffle:
+        random.shuffle(items)
+    items = items[: rows * cols]
+
+    if relative_path:
+        root_path = file.path(filename)
+        for item in items:
+            if item.get("filename", ""):
+                item["filename"] = os.path.join(
+                    root_path,
+                    item["filename"],
+                )
+
+    _, axes = plt.subplots(
+        rows,
+        cols,
+        figsize=(
+            scale * cols,
+            scale * rows,
+        ),
+    )
+    axes = axes.flatten()
+
+    for i, item in enumerate(items):
+        if item.get("pass", False):
+            axes[i].axis("off")
+            continue
+
+        if item.get("filename", ""):
+            success, item["image"] = file.load_image(
+                item.get("filename", ""),
+                log=log,
+            )
+            if not success:
+                return False
+
+        ax = axes[i]
+        image = item["image"]
+        ax.imshow(
+            image,
+            cmap="gray" if image.ndim == 2 else None,
+        )
+        ax.set_title(
+            item.get("title", f"#{i}"),
+            fontsize=10,
+        )
+        ax.axis("off")
+
+    plt.tight_layout()
+
+    if not file.save_fig(
+        filename,
+        log=log,
+    ):
+        return False
+
+    return sign_filename(
+        filename,
+        [" | ".join(objects.signature("grid.png") + header)],
+        [" | ".join(footer)],
+    )

{bluer_objects-6.192.1 → bluer_objects-6.202.1}/bluer_objects/storage/WebDAV.py

@@ -87,10 +87,11 @@ class WebDAVInterface(StorageInterface):
         object_name: str,
         filename: str = "",
         public: bool = False,
+        zip: bool = False,
         log: bool = True,
     ) -> bool:
-        if public:
-            logger.error("public not supported.")
+        if public or zip:
+            logger.error("public/zip upload not supported.")
             return False
 
         if filename:
@@ -117,5 +118,6 @@ class WebDAVInterface(StorageInterface):
             object_name=object_name,
             filename=filename,
             public=public,
+            zip=zip,
             log=log,
         )

{bluer_objects-6.192.1 → bluer_objects-6.202.1}/bluer_objects/storage/WebDAVrequest.py

@@ -279,10 +279,11 @@ class WebDAVRequestInterface(StorageInterface):
         object_name: str,
         filename: str = "",
         public: bool = False,
+        zip: bool = False,
         log: bool = True,
     ) -> bool:
-        if public:
-            logger.error("public not supported.")
+        if public or zip:
+            logger.error("public/zip upload not supported.")
             return False
 
         if filename:
@@ -321,6 +322,7 @@ class WebDAVRequestInterface(StorageInterface):
                     object_name=object_name,
                     filename=filename,
                     public=public,
+                    zip=zip,
                     log=log,
                 )
 

{bluer_objects-6.192.1 → bluer_objects-6.202.1}/bluer_objects/storage/WebDAVzip.py

@@ -126,10 +126,11 @@ class WebDAVzipInterface(StorageInterface):
         object_name: str,
         filename: str = "",
         public: bool = False,
+        zip: bool = False,
         log: bool = True,
     ) -> bool:
-        if public:
-            logger.error("public not supported.")
+        if public or zip:
+            logger.error("public/zip upload not supported.")
             return False
 
         object_path = objects.object_path(object_name=object_name)
@@ -155,5 +156,6 @@ class WebDAVzipInterface(StorageInterface):
         return super().upload(
             object_name=object_name,
             public=public,
+            zip=zip,
             log=log,
         )

{bluer_objects-6.192.1 → bluer_objects-6.202.1}/bluer_objects/storage/__init__.py

@@ -57,11 +57,13 @@ def upload(
     object_name: str,
     filename: str = "",
     public: bool = False,
+    zip: bool = False,
     log: bool = True,
 ) -> bool:
     return interface.upload(
         object_name=object_name,
         filename=filename,
         public=public,
+        zip=zip,
         log=log,
     )

{bluer_objects-6.192.1 → bluer_objects-6.202.1}/bluer_objects/storage/__main__.py

@@ -30,6 +30,12 @@ parser.add_argument(
     default=0,
     help="0 | 1",
 )
+parser.add_argument(
+    "--zip",
+    type=int,
+    default=0,
+    help="0 | 1",
+)
 parser.add_argument(
     "--where",
     type=str,
@@ -86,6 +92,7 @@ elif args.task == "upload":
     success = storage.upload(
         object_name=args.object_name,
         filename=args.filename,
+        zip=args.zip == 1,
         public=args.public == 1,
     )
 else:

{bluer_objects-6.192.1 → bluer_objects-6.202.1}/bluer_objects/storage/base.py

@@ -67,6 +67,7 @@ class StorageInterface:
         object_name: str,
         filename: str = "",
         public: bool = False,
+        zip: bool = False,
         log: bool = True,
     ) -> bool:
         if log:
@@ -74,7 +75,7 @@ class StorageInterface:
                 "{}.upload {}{}{}".format(
                     self.__class__.__name__,
                     object_name,
-                    f"/{filename}" if filename else "",
+                    ".tar.gz" if zip else f"/{filename}" if filename else "",
                     " [public]" if public else "",
                 )
             )

{bluer_objects-6.192.1 → bluer_objects-6.202.1}/bluer_objects/storage/s3.py

@@ -1,4 +1,5 @@
 import boto3
+import os
 from botocore.exceptions import ClientError
 import glob
 from typing import Tuple, List
@@ -7,6 +8,7 @@ from tqdm import tqdm
 from functools import reduce
 
 from bluer_objects.storage.base import StorageInterface
+from bluer_objects.env import ABCLI_OBJECT_ROOT
 from bluer_objects import env, file, path
 from bluer_objects import objects
 from bluer_objects.logger import logger
@@ -226,12 +228,20 @@ class S3Interface(StorageInterface):
         object_name: str,
         filename: str = "",
         public: bool = False,
+        zip: bool = False,
         log: bool = True,
     ) -> bool:
-        if filename:
-            local_path = objects.path_of(
-                object_name=object_name,
-                filename=filename,
+        if filename or zip:
+            local_path = (
+                os.path.join(
+                    ABCLI_OBJECT_ROOT,
+                    f"{object_name}.tar.gz",
+                )
+                if zip
+                else objects.path_of(
+                    object_name=object_name,
+                    filename=filename,
+                )
             )
 
             bucket_name = (
@@ -252,20 +262,22 @@ class S3Interface(StorageInterface):
                     bucket.put_object(
                         ACL="public-read" if public else "private",
                         Body=fp,
-                        Key=f"{object_name}/{filename}",
+                        Key=(
+                            f"{object_name}.tar.gz"
+                            if zip
+                            else f"{object_name}/{filename}"
+                        ),
                     )
             except ClientError as e:
                 logger.error(e)
                 return False
 
             if public:
-
                 logger.info(
-                    "🔗 https://{}.{}/{}/{}".format(
+                    "🔗 https://{}.{}/{}".format(
                         bucket_name,
                         env.S3_STORAGE_ENDPOINT_URL.split("https://", 1)[1],
-                        object_name,
-                        filename,
+                        f"{object_name}.tar.gz" if zip else f"{object_name}/{filename}",
                     )
                 )
 
@@ -273,6 +285,7 @@ class S3Interface(StorageInterface):
                 object_name=object_name,
                 filename=filename,
                 public=public,
+                zip=zip,
                 log=log,
             )
 

bluer_objects-6.202.1/bluer_objects/tests/test_log_image_grid.py

@@ -0,0 +1,29 @@
+from bluer_objects import objects
+from bluer_objects.testing import create_test_asset
+from bluer_objects.logger.image import log_image_grid
+
+
+def test_log_image_grid():
+    object_name = objects.unique_object("test_log_image_grid")
+
+    depth = 10
+
+    assert create_test_asset(
+        object_name=object_name,
+        depth=depth,
+    )
+
+    assert log_image_grid(
+        [
+            {
+                "filename": objects.path_of(
+                    object_name=object_name,
+                    filename=f"test-{suffix:02d}.png",
+                )
+                for suffix in range(depth)
+            }
+        ],
+        objects.path_of(object_name=object_name, filename="image_grid.png"),
+        rows=2,
+        cols=5,
+    )

{bluer_objects-6.192.1 → bluer_objects-6.202.1/bluer_objects.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bluer_objects
-Version: 6.192.1
+Version: 6.202.1
 Summary: 🌀 Object management in Bash.
 Home-page: https://github.com/kamangir/bluer-objects
 Author: Arash Abadpour (Kamangir)
@@ -64,6 +64,6 @@ pip install bluer-objects
 
 [![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 README`](https://github.com/kamangir/bluer-objects/tree/main/bluer_objects/README), based on 🌀 [`bluer_objects-6.192.1`](https://github.com/kamangir/bluer-objects).
+built by 🌀 [`bluer README`](https://github.com/kamangir/bluer-objects/tree/main/bluer_objects/README), based on 🌀 [`bluer_objects-6.202.1`](https://github.com/kamangir/bluer-objects).
 
 built by 🌀 [`blueness-3.118.1`](https://github.com/kamangir/blueness).

{bluer_objects-6.192.1 → bluer_objects-6.202.1}/bluer_objects.egg-info/SOURCES.txt

@@ -118,6 +118,7 @@ bluer_objects/host/__init__.py
 bluer_objects/host/__main__.py
 bluer_objects/host/functions.py
 bluer_objects/logger/__init__.py
+bluer_objects/logger/image.py
 bluer_objects/logger/matrix.py
 bluer_objects/metadata/__init__.py
 bluer_objects/metadata/__main__.py
@@ -159,6 +160,7 @@ bluer_objects/tests/test_graphics_gif.py
 bluer_objects/tests/test_graphics_screen.py
 bluer_objects/tests/test_graphics_signature.py
 bluer_objects/tests/test_graphics_text.py
+bluer_objects/tests/test_log_image_grid.py
 bluer_objects/tests/test_logger.py
 bluer_objects/tests/test_logger_matrix.py
 bluer_objects/tests/test_markdown.py