bluer-objects 6.28.1__tar.gz → 6.30.1__tar.gz

{bluer_objects-6.28.1/bluer_objects.egg-info → bluer_objects-6.30.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bluer_objects
-Version: 6.28.1
+Version: 6.30.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.26.1`](https://github.com/kamangir/awesome-bash-cli), based on 🌀 [`bluer_objects-6.28.1`](https://github.com/kamangir/bluer-objects).
+built by 🌀 [`bluer_options-5.28.1`](https://github.com/kamangir/awesome-bash-cli), based on 🌀 [`bluer_objects-6.30.1`](https://github.com/kamangir/bluer-objects).
 
 built by 🌀 [`blueness-3.96.1`](https://github.com/kamangir/blueness).

{bluer_objects-6.28.1 → bluer_objects-6.30.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.26.1`](https://github.com/kamangir/awesome-bash-cli), based on 🌀 [`bluer_objects-6.28.1`](https://github.com/kamangir/bluer-objects).
+built by 🌀 [`bluer_options-5.28.1`](https://github.com/kamangir/awesome-bash-cli), based on 🌀 [`bluer_objects-6.30.1`](https://github.com/kamangir/bluer-objects).

{bluer_objects-6.28.1 → bluer_objects-6.30.1}/bluer_objects/.abcli/tests/gif.sh

@@ -9,5 +9,5 @@ function test_bluer_objects_gif() {
         --frame_duration 200 \
         --output_filename test.gif \
         --scale 2 \
-        --suffix .jpg
+        --suffix .png
 }

{bluer_objects-6.28.1 → bluer_objects-6.30.1}/bluer_objects/__init__.py

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

bluer_objects-6.30.1/bluer_objects/config.env

@@ -0,0 +1,5 @@
+ABCLI_MLFLOW_URL_SUBDOMAIN=ml
+
+ABCLI_MLFLOW_EXPERIMENT_PREFIX=experiment/
+
+BLUER_OBJECTS_STORAGE_INTERFACE=webdavzip

{bluer_objects-6.28.1 → bluer_objects-6.30.1}/bluer_objects/env.py

@@ -30,16 +30,9 @@ abcli_path_git = get_env(
 
 ABCLI_PATH_STATIC = get_env("ABCLI_PATH_STATIC")
 
-VANWATCH_TEST_OBJECT = get_env("VANWATCH_TEST_OBJECT")
-
 # https://www.randomtextgenerator.com/
 DUMMY_TEXT = "This is some dummy text. This is some dummy text. This is some dummy text. This is some dummy text. This is some dummy text. This is some dummy text. This is some dummy text. This is some dummy text. This is some dummy text. This is some dummy text."
 
-DATABRICKS_WORKSPACE = get_env("DATABRICKS_WORKSPACE")
-
-DATABRICKS_HOST = get_env("DATABRICKS_HOST")
-DATABRICKS_TOKEN = get_env("DATABRICKS_TOKEN")
-
 ABCLI_MLFLOW_EXPERIMENT_PREFIX = get_env("ABCLI_MLFLOW_EXPERIMENT_PREFIX")
 
 ABCLI_S3_OBJECT_PREFIX = "to-be-removed"

{bluer_objects-6.28.1 → bluer_objects-6.30.1}/bluer_objects/metadata/post.py

@@ -81,7 +81,7 @@ def post_to_object(
     ):
         return False
 
-    return not upload or objects.upload(
+    return not upload or storage.upload(
         object_name=object_name,
         filename="metadata.yaml",
     )

bluer_objects-6.30.1/bluer_objects/objects.py

@@ -0,0 +1,87 @@
+import os
+
+from bluer_options import string
+
+from bluer_objects import file, path
+from bluer_objects.env import (
+    ABCLI_OBJECT_ROOT,
+    abcli_object_name,
+    ABCLI_S3_OBJECT_PREFIX,
+)
+from bluer_objects.host import shell
+from bluer_objects.logger import logger
+
+
+def list_of_files(
+    object_name: str,
+    cloud: bool = False,
+    **kwargs,
+):
+    if cloud:
+        # TODO
+        return []
+
+    return file.list_of(
+        os.path.join(
+            ABCLI_OBJECT_ROOT,
+            object_name,
+            "*",
+        ),
+        **kwargs,
+    )
+
+
+def object_path(
+    object_name=".",
+    create=False,
+):
+    output = os.path.join(
+        ABCLI_OBJECT_ROOT,
+        abcli_object_name if object_name == "." else object_name,
+    )
+
+    if create:
+        os.makedirs(output, exist_ok=True)
+
+    return output
+
+
+def path_of(
+    filename,
+    object_name=".",
+    create=False,
+):
+    return os.path.join(
+        object_path(object_name, create),
+        filename,
+    )
+
+
+def signature(info=None, object_name="."):
+    return [
+        "{}{}".format(
+            abcli_object_name if object_name == "." else object_name,
+            "" if info is None else f"/{str(info)}",
+        ),
+        string.pretty_date(include_time=False),
+        string.pretty_date(include_date=False, include_zone=True),
+    ]
+
+
+def unique_object(
+    prefix: str = "",
+    include_time: bool = True,
+):
+    object_name = string.pretty_date(
+        as_filename=True,
+        include_time=include_time,
+        unique=True,
+    )
+    if prefix:
+        object_name = f"{prefix}-{object_name}"
+
+    path.create(object_path(object_name))
+
+    logger.info(f"📂 {object_name}")
+
+    return object_name

{bluer_objects-6.28.1 → bluer_objects-6.30.1}/bluer_objects/storage/WebDAVzip.py

@@ -31,6 +31,14 @@ class WebDAVzipInterface(StorageInterface):
         object_path = objects.object_path(object_name=object_name)
         zip_filename = f"{object_path}.zip"
 
+        try:
+            if not self.client.check(remote_path=f"{object_name}.zip"):
+                logger.warning(f"{object_name} doesn't exist.")
+                return True
+        except Exception as e:
+            logger.error(e)
+            return False
+
         try:
             self.client.download_sync(
                 remote_path=f"{object_name}.zip",

{bluer_objects-6.28.1 → bluer_objects-6.30.1}/bluer_objects/tests/test_env.py

@@ -10,12 +10,6 @@ def test_required_env():
 
 
 def test_bluer_objects_env():
-    assert env.VANWATCH_TEST_OBJECT
-
-    assert env.DATABRICKS_WORKSPACE
-    assert env.DATABRICKS_HOST
-    assert env.DATABRICKS_TOKEN
-
     assert env.ABCLI_MLFLOW_EXPERIMENT_PREFIX
 
     assert env.BLUER_OBJECTS_STORAGE_INTERFACE in [

{bluer_objects-6.28.1 → bluer_objects-6.30.1}/bluer_objects/tests/test_file_load_save.py

@@ -1,21 +1,23 @@
 import pytest
-from typing import Callable, Union, Tuple, List
+from typing import Callable, Union, Tuple
 import numpy as np
 
 from bluer_options import string
 
-from bluer_objects import file, objects, env
+from bluer_objects import file, objects
 from bluer_objects.file.load import (
     load_image,
     load_json,
     load_matrix,
     load_text,
+    load_yaml,
 )
 from bluer_objects.file.save import (
     save_image,
     save_json,
     save_matrix,
     save_text,
+    save_yaml,
 )
 from bluer_objects.tests.test_objects import test_object
 
@@ -29,19 +31,24 @@ from bluer_objects.tests.test_objects import test_object
     [
         [
             load_image,
-            "Victoria41East.jpg",
+            "test-00.png",
             save_image,
         ],
         [
             load_json,
-            "vancouver.json",
+            "test.json",
             save_json,
         ],
         [
             load_text,
-            "vancouver.json",
+            "test.yaml",
             save_text,
         ],
+        [
+            load_yaml,
+            "test.yaml",
+            save_yaml,
+        ],
     ],
 )
 def test_file_load_save(

bluer_objects-6.30.1/bluer_objects/tests/test_graphics.py

@@ -0,0 +1,13 @@
+import pytest
+import numpy as np
+
+from bluer_objects.logger import logger
+
+
+@pytest.fixture
+def test_image():
+    matrix = (np.random.rand(512, 512, 3) * 255).astype(np.uint8)
+
+    yield matrix
+
+    logger.info(f"deleting test_image ...")

{bluer_objects-6.28.1 → bluer_objects-6.30.1}/bluer_objects/tests/test_graphics_gif.py

@@ -3,28 +3,25 @@ import glob
 
 from bluer_objects import objects
 from bluer_objects import storage
+from bluer_objects.tests.test_objects import test_object
 from bluer_objects.graphics.gif import generate_animated_gif
 
 
 @pytest.mark.parametrize(
-    ["object_name", "scale"],
+    ["scale"],
     [
-        ["void", 1],
-        ["2024-05-07-18-45-13-31678", 2],
+        [1],
+        [2],
     ],
 )
 def test_graphics_gif_generate_animated_gif(
-    object_name: str,
+    test_object,
     scale: int,
 ):
-    assert storage.download(object_name)
-
-    list_of_images = list(glob.glob(objects.path_of("*.png", object_name)))
-    if object_name != "void":
-        assert list_of_images
+    list_of_images = list(glob.glob(objects.path_of("*.png", test_object)))
 
     assert generate_animated_gif(
         list_of_images,
-        objects.path_of("test.gif", object_name),
+        objects.path_of("test.gif", test_object),
         scale=scale,
     )

{bluer_objects-6.28.1 → bluer_objects-6.30.1}/bluer_objects/tests/test_objects.py

@@ -1,24 +1,49 @@
 import pytest
+import numpy as np
 
-from blueness import module
+from bluer_options import string
 
-from bluer_objects import file, path, objects, NAME
+from bluer_objects import file, path, objects
 from bluer_objects import storage
-from bluer_objects.env import VANWATCH_TEST_OBJECT
 from bluer_objects.logger import logger
 
-NAME = module.name(__file__, NAME)
-
 
 @pytest.fixture
 def test_object():
-    object_name = VANWATCH_TEST_OBJECT
+    object_name = objects.unique_object("test_object")
+    for suffix in range(10):
+        assert file.save_image(
+            objects.path_of(
+                object_name=object_name,
+                filename=f"test-{suffix:02d}.png",
+            ),
+            (np.random.rand(512, 512, 3) * 255).astype(np.uint8),
+        )
+
+    depth = 10
+    data = {
+        string.random(length=depth): string.random(length=depth) for _ in range(depth)
+    }
 
-    assert storage.download(object_name=object_name)
+    assert file.save_yaml(
+        objects.path_of(
+            object_name=object_name,
+            filename="test.yaml",
+        ),
+        data,
+    )
+
+    assert file.save_json(
+        objects.path_of(
+            object_name=object_name,
+            filename="test.json",
+        ),
+        data,
+    )
 
     yield object_name
 
-    logger.info(f"deleting {NAME}.test_object ...")
+    logger.info(f"deleting test_object ...")
 
 
 @pytest.mark.parametrize(
@@ -29,6 +54,10 @@ def test_objects_list_of_files(
     test_object,
     cloud: bool,
 ):
+    if cloud:
+        # TODO: enable when implemented
+        return
+
     list_of_files = [
         file.name_and_extension(filename)
         for filename in objects.list_of_files(
@@ -37,7 +66,7 @@ def test_objects_list_of_files(
         )
     ]
 
-    assert "vancouver.json" in list_of_files
+    assert "test-00.png" in list_of_files
 
 
 def test_object_object_path():
@@ -51,7 +80,7 @@ def test_objects_path_of(test_object):
     assert file.exists(
         objects.path_of(
             object_name=test_object,
-            filename="vancouver.json",
+            filename="test-00.png",
         )
     )
 

{bluer_objects-6.28.1 → bluer_objects-6.30.1}/bluer_objects/tests/test_storage.py

@@ -35,7 +35,7 @@ def test_storage():
             filename=filename,
         )
 
-    assert objects.upload(object_name=object_name)
+    assert storage.upload(object_name=object_name)
 
     for filename in [
         "this.yaml",
@@ -46,4 +46,4 @@ def test_storage():
             filename=filename,
         )
 
-    assert objects.download(object_name=object_name)
+    assert storage.download(object_name=object_name)

{bluer_objects-6.28.1 → bluer_objects-6.30.1/bluer_objects.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bluer_objects
-Version: 6.28.1
+Version: 6.30.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.26.1`](https://github.com/kamangir/awesome-bash-cli), based on 🌀 [`bluer_objects-6.28.1`](https://github.com/kamangir/bluer-objects).
+built by 🌀 [`bluer_options-5.28.1`](https://github.com/kamangir/awesome-bash-cli), based on 🌀 [`bluer_objects-6.30.1`](https://github.com/kamangir/bluer-objects).
 
 built by 🌀 [`blueness-3.96.1`](https://github.com/kamangir/blueness).

bluer_objects-6.28.1/bluer_objects/config.env

@@ -1,9 +0,0 @@
-VANWATCH_TEST_OBJECT=vanwatch-test-object-v2
-
-DATABRICKS_WORKSPACE=abcli-v4
-
-ABCLI_MLFLOW_URL_SUBDOMAIN=ml
-
-ABCLI_MLFLOW_EXPERIMENT_PREFIX=experiment/
-
-BLUER_OBJECTS_STORAGE_INTERFACE=webdavzip

bluer_objects-6.28.1/bluer_objects/objects.py

@@ -1,163 +0,0 @@
-import os
-
-from bluer_options import string
-
-from bluer_objects import file, path
-from bluer_objects.env import (
-    ABCLI_OBJECT_ROOT,
-    abcli_object_name,
-    ABCLI_S3_OBJECT_PREFIX,
-)
-from bluer_objects.host import shell
-from bluer_objects.logger import logger
-
-
-def download(
-    object_name: str,
-    filename: str = "",
-    overwrite: bool = False,
-) -> bool:
-    if not ABCLI_S3_OBJECT_PREFIX:
-        logger.error("ABCLI_S3_OBJECT_PREFIX is not set.")
-        return False
-
-    if not object_name:
-        logger.error("object_name not found.")
-        return False
-
-    if (
-        filename
-        and not overwrite
-        and file.exists(
-            path_of(
-                object_name=object_name,
-                filename=filename,
-            )
-        )
-    ):
-        return True
-
-    return (
-        shell(
-            "aws s3 cp {}/{}/{} {}".format(
-                ABCLI_S3_OBJECT_PREFIX,
-                object_name,
-                filename,
-                object_path(object_name, create=True),
-            )
-        )
-        if filename
-        else shell(
-            "aws s3 sync {}/{}/ {}".format(
-                ABCLI_S3_OBJECT_PREFIX,
-                object_name,
-                object_path(object_name, create=True),
-            )
-        )
-    )
-
-
-def list_of_files(
-    object_name: str,
-    cloud: bool = False,
-    **kwargs,
-):
-    if cloud:
-        # TODO
-        return []
-
-    return file.list_of(
-        os.path.join(
-            ABCLI_OBJECT_ROOT,
-            object_name,
-            "*",
-        ),
-        **kwargs,
-    )
-
-
-def object_path(
-    object_name=".",
-    create=False,
-):
-    output = os.path.join(
-        ABCLI_OBJECT_ROOT,
-        abcli_object_name if object_name == "." else object_name,
-    )
-
-    if create:
-        os.makedirs(output, exist_ok=True)
-
-    return output
-
-
-def path_of(
-    filename,
-    object_name=".",
-    create=False,
-):
-    return os.path.join(
-        object_path(object_name, create),
-        filename,
-    )
-
-
-def signature(info=None, object_name="."):
-    return [
-        "{}{}".format(
-            abcli_object_name if object_name == "." else object_name,
-            "" if info is None else f"/{str(info)}",
-        ),
-        string.pretty_date(include_time=False),
-        string.pretty_date(include_date=False, include_zone=True),
-    ]
-
-
-def unique_object(
-    prefix: str = "",
-    include_time: bool = True,
-):
-    object_name = string.pretty_date(
-        as_filename=True,
-        include_time=include_time,
-        unique=True,
-    )
-    if prefix:
-        object_name = f"{prefix}-{object_name}"
-
-    path.create(object_path(object_name))
-
-    logger.info(f"📂 {object_name}")
-
-    return object_name
-
-
-def upload(
-    object_name: str,
-    filename: str = "",
-) -> bool:
-    if not ABCLI_S3_OBJECT_PREFIX:
-        logger.error("ABCLI_S3_OBJECT_PREFIX is not set.")
-        return False
-
-    if not object_name:
-        logger.error("object_name not found.")
-        return False
-
-    return (
-        shell(
-            "aws s3 cp {} {}/{}/".format(
-                path_of(filename=filename, object_name=object_name),
-                ABCLI_S3_OBJECT_PREFIX,
-                object_name,
-            )
-        )
-        if filename
-        else shell(
-            "aws s3 sync {} {}/{}/".format(
-                object_path(object_name, create=True),
-                ABCLI_S3_OBJECT_PREFIX,
-                object_name,
-            )
-        )
-    )

bluer_objects-6.28.1/bluer_objects/tests/test_graphics.py

@@ -1,29 +0,0 @@
-import pytest
-
-from blueness import module
-
-from bluer_objects import file, objects, NAME
-from bluer_objects import storage
-from bluer_objects.env import VANWATCH_TEST_OBJECT
-from bluer_objects.logger import logger
-
-NAME = module.name(__file__, NAME)
-
-
-@pytest.fixture
-def test_image():
-    object_name = VANWATCH_TEST_OBJECT
-
-    assert storage.download(object_name)
-
-    success, matrix = file.load_image(
-        objects.path_of(
-            "Victoria41East.jpg",
-            object_name,
-        )
-    )
-    assert success
-
-    yield matrix
-
-    logger.info(f"deleting {NAME}.test_object ...")