bluer-ugv 7.359.1__tar.gz → 7.421.1__tar.gz

{bluer_ugv-7.359.1/bluer_ugv.egg-info → bluer_ugv-7.421.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bluer_ugv
-Version: 7.359.1
+Version: 7.421.1
 Summary: 🐬 AI x UGV.
 Home-page: https://github.com/kamangir/bluer-ugv
 Author: Arash Abadpour (Kamangir)
@@ -64,7 +64,7 @@ pip install bluer_ugv
 
 [![pylint](https://github.com/kamangir/bluer-ugv/actions/workflows/pylint.yml/badge.svg)](https://github.com/kamangir/bluer-ugv/actions/workflows/pylint.yml) [![pytest](https://github.com/kamangir/bluer-ugv/actions/workflows/pytest.yml/badge.svg)](https://github.com/kamangir/bluer-ugv/actions/workflows/pytest.yml) [![bashtest](https://github.com/kamangir/bluer-ugv/actions/workflows/bashtest.yml/badge.svg)](https://github.com/kamangir/bluer-ugv/actions/workflows/bashtest.yml) [![PyPI version](https://img.shields.io/pypi/v/bluer-ugv.svg)](https://pypi.org/project/bluer-ugv/) [![PyPI - Downloads](https://img.shields.io/pypi/dd/bluer-ugv)](https://pypistats.org/packages/bluer-ugv)
 
-built by 🌀 [`bluer README`](https://github.com/kamangir/bluer-objects/tree/main/bluer_objects/README), based on 🐬 [`bluer_ugv-7.359.1`](https://github.com/kamangir/bluer-ugv).
+built by 🌀 [`bluer README`](https://github.com/kamangir/bluer-objects/tree/main/bluer_objects/README), based on 🐬 [`bluer_ugv-7.421.1`](https://github.com/kamangir/bluer-ugv).
 
 
 built by 🌀 [`blueness-3.118.1`](https://github.com/kamangir/blueness).

{bluer_ugv-7.359.1 → bluer_ugv-7.421.1}/README.md

@@ -35,5 +35,5 @@ pip install bluer_ugv
 
 [![pylint](https://github.com/kamangir/bluer-ugv/actions/workflows/pylint.yml/badge.svg)](https://github.com/kamangir/bluer-ugv/actions/workflows/pylint.yml) [![pytest](https://github.com/kamangir/bluer-ugv/actions/workflows/pytest.yml/badge.svg)](https://github.com/kamangir/bluer-ugv/actions/workflows/pytest.yml) [![bashtest](https://github.com/kamangir/bluer-ugv/actions/workflows/bashtest.yml/badge.svg)](https://github.com/kamangir/bluer-ugv/actions/workflows/bashtest.yml) [![PyPI version](https://img.shields.io/pypi/v/bluer-ugv.svg)](https://pypi.org/project/bluer-ugv/) [![PyPI - Downloads](https://img.shields.io/pypi/dd/bluer-ugv)](https://pypistats.org/packages/bluer-ugv)
 
-built by 🌀 [`bluer README`](https://github.com/kamangir/bluer-objects/tree/main/bluer_objects/README), based on 🐬 [`bluer_ugv-7.359.1`](https://github.com/kamangir/bluer-ugv).
+built by 🌀 [`bluer README`](https://github.com/kamangir/bluer-objects/tree/main/bluer_objects/README), based on 🐬 [`bluer_ugv-7.421.1`](https://github.com/kamangir/bluer-ugv).
 

{bluer_ugv-7.359.1 → bluer_ugv-7.421.1}/bluer_ugv/.abcli/swallow/dataset.sh

@@ -9,7 +9,7 @@ function bluer_ugv_swallow_dataset() {
         return
     fi
 
-    python3 - bluer_ugv.swallow.dataset "$@"
+    python3 -m bluer_ugv.swallow.dataset "$@"
 }
 
 bluer_ai_source_caller_suffix_path /dataset

bluer_ugv-7.421.1/bluer_ugv/.abcli/swallow/video/play.sh

@@ -0,0 +1,7 @@
+#! /usr/bin/env bash
+
+function bluer_ugv_swallow_video_play() {
+    python3 -m bluer_ugv.swallow.session.classical.screen.video \
+        play \
+        "$@"
+}

bluer_ugv-7.421.1/bluer_ugv/.abcli/swallow/video/playlist/cat.sh

@@ -0,0 +1,14 @@
+#! /usr/bin/env bash
+
+function bluer_ugv_swallow_video_playlist_cat() {
+    local options=$1
+    local do_download=$(bluer_ai_option_int "$options" download 0)
+
+    [[ "$do_download" == 1 ]] &&
+        bluer_ugv_swallow_video_playlist_download \
+            filename=void \
+            $RANGIN_VIDEO_LIST_OBJECT
+
+    bluer_ai_cat \
+        $ABCLI_OBJECT_ROOT/$RANGIN_VIDEO_LIST_OBJECT/metadata.yaml
+}

bluer_ugv-7.421.1/bluer_ugv/.abcli/swallow/video/playlist/download.sh

@@ -0,0 +1,18 @@
+#! /usr/bin/env bash
+
+function bluer_ugv_swallow_video_playlist_download() {
+    local options=${1:-policy=doesnt_exist}
+
+    [[ "$abcli_is_rpi" == true ]] &&
+        sudo chown pi:pi \
+            $ABCLI_OBJECT_ROOT/$RANGIN_VIDEO_LIST_OBJECT
+
+    bluer_objects_download \
+        filename=metadata.yaml \
+        $RANGIN_VIDEO_LIST_OBJECT
+    [[ $? -ne 0 ]] && return 1
+
+    bluer_objects_download \
+        ,$options \
+        $RANGIN_VIDEO_LIST_OBJECT
+}

bluer_ugv-7.421.1/bluer_ugv/.abcli/swallow/video/playlist/edit.sh

@@ -0,0 +1,14 @@
+#! /usr/bin/env bash
+
+function bluer_ugv_swallow_video_playlist_edit() {
+    local options=$1
+    local do_download=$(bluer_ai_option_int "$options" download 0)
+
+    [[ "$do_download" == 1 ]] &&
+        bluer_ugv_swallow_video_playlist_download \
+            filename=void \
+            $RANGIN_VIDEO_LIST_OBJECT
+
+    bluer_ai_code \
+        $ABCLI_OBJECT_ROOT/$RANGIN_VIDEO_LIST_OBJECT/metadata.yaml
+}

bluer_ugv-7.421.1/bluer_ugv/.abcli/swallow/video/playlist/upload.sh

@@ -0,0 +1,9 @@
+#! /usr/bin/env bash
+
+function bluer_ugv_swallow_video_playlist_upload() {
+    local options=${1:-filename=metadata.yaml}
+
+    bluer_objects_upload \
+        ,$options \
+        $RANGIN_VIDEO_LIST_OBJECT
+}

bluer_ugv-7.421.1/bluer_ugv/.abcli/swallow/video/playlist.sh

@@ -0,0 +1,15 @@
+#! /usr/bin/env bash
+
+function bluer_ugv_swallow_video_playlist() {
+    local task=$1
+
+    local function_name=bluer_ugv_swallow_video_playlist_$task
+    if [[ $(type -t $function_name) == "function" ]]; then
+        $function_name "${@:2}"
+        return
+    fi
+
+    python3 -m bluer_ugv.swallow.session.classical.screen.video "$@"
+}
+
+bluer_ai_source_caller_suffix_path /playlist

bluer_ugv-7.421.1/bluer_ugv/.abcli/swallow/video.sh

@@ -0,0 +1,15 @@
+#! /usr/bin/env bash
+
+function bluer_ugv_swallow_video() {
+    local task=$1
+
+    local function_name=bluer_ugv_swallow_video_$task
+    if [[ $(type -t $function_name) == "function" ]]; then
+        $function_name "${@:2}"
+        return
+    fi
+
+    python3 -m bluer_ugv.swallow.session.classical.screen.video "$@"
+}
+
+bluer_ai_source_caller_suffix_path /video

{bluer_ugv-7.359.1 → bluer_ugv-7.421.1}/bluer_ugv/.abcli/swallow.sh

@@ -9,7 +9,7 @@ function bluer_ugv_swallow() {
         return
     fi
 
-    python3 - bluer_ugv.swallow "$@"
+    python3 -m bluer_ugv.swallow "$@"
 }
 
 bluer_ai_source_caller_suffix_path /swallow

{bluer_ugv-7.359.1 → bluer_ugv-7.421.1}/bluer_ugv/.abcli/tests/help.sh

@@ -29,6 +29,14 @@ function test_bluer_ugv_help() {
         "@swallow ultrasonic review" \
         "@swallow ultrasonic test" \
         \
+        "@swallow video" \
+        "@swallow video play" \
+        "@swallow video playlist" \
+        "@swallow video playlist cat" \
+        "@swallow video playlist download" \
+        "@swallow video playlist edit" \
+        "@swallow video playlist upload" \
+        \
         "@ugv" \
         \
         "@ugv git" \

bluer_ugv-7.421.1/bluer_ugv/.abcli/tests/swallow_video_play.sh

@@ -0,0 +1,11 @@
+#! /usr/bin/env bash
+
+function test_swallow_video_play() {
+    local options=$1
+
+    bluer_ai_eval ,$options \
+        bluer_ugv \
+        swallow \
+        video \
+        play
+}

bluer_ugv-7.421.1/bluer_ugv/.abcli/tests/swallow_video_playlist.sh

@@ -0,0 +1,45 @@
+#! /usr/bin/env bash
+
+function test_swallow_video_playlist_cat() {
+    local options=$1
+
+    bluer_ai_eval ,$options \
+        bluer_ugv \
+        swallow \
+        video \
+        playlist \
+        cat
+}
+
+function test_swallow_video_playlist_download_upload() {
+    local options=$1
+
+    bluer_ai_eval ,$options \
+        bluer_ugv \
+        swallow \
+        video \
+        playlist \
+        download \
+        policy=doesnt_exist
+    [[ $? -ne 0 ]] && return 1
+
+    bluer_ai_eval ,$options \
+        bluer_ugv \
+        swallow \
+        video \
+        playlist \
+        upload \
+        filename=metadata.yaml
+}
+
+function test_swallow_video_playlist_edit() {
+    local options=$1
+
+    bluer_ai_eval ,$options \
+        bluer_ugv \
+        swallow \
+        video \
+        playlist \
+        edit \
+        download
+}

{bluer_ugv-7.359.1 → bluer_ugv-7.421.1}/bluer_ugv/__init__.py

@@ -4,7 +4,7 @@ ICON = "🐬"
 
 DESCRIPTION = f"{ICON} AI x UGV."
 
-VERSION = "7.359.1"
+VERSION = "7.421.1"
 
 REPO_NAME = "bluer-ugv"
 

{bluer_ugv-7.359.1 → bluer_ugv-7.421.1}/bluer_ugv/config.env

@@ -27,4 +27,6 @@ BLUER_UGV_ULTRASONIC_SENSOR_MAX_M=0.8
 
 BLUER_UGV_ULTRASONIC_SENSOR_KEEP_LOG=1
 
-BLUER_UGV_ULTRASONIC_SENSOR_LOG=0
+BLUER_UGV_ULTRASONIC_SENSOR_LOG=0
+
+RANGIN_VIDEO_LIST_OBJECT=rangin-video-list-1

{bluer_ugv-7.359.1 → bluer_ugv-7.421.1}/bluer_ugv/env.py

@@ -81,3 +81,5 @@ BLUER_UGV_ULTRASONIC_SENSOR_LOG = get_env(
     "BLUER_UGV_ULTRASONIC_SENSOR_LOG",
     1,
 )
+
+RANGIN_VIDEO_LIST_OBJECT = get_env("RANGIN_VIDEO_LIST_OBJECT")

{bluer_ugv-7.359.1 → bluer_ugv-7.421.1}/bluer_ugv/help/swallow/__init__.py

@@ -6,6 +6,7 @@ from bluer_ugv.help.swallow.select_target import help_select_target
 from bluer_ugv.help.swallow.ultrasonic_sensor import (
     help_functions as help_ultrasonic_sensor,
 )
+from bluer_ugv.help.swallow.video.functions import help_functions as help_video
 
 help_functions = {
     "dataset": help_dataset,
@@ -14,4 +15,5 @@ help_functions = {
     "keyboard": help_keyboard,
     "select_target": help_select_target,
     "ultrasonic": help_ultrasonic_sensor,
+    "video": help_video,
 }

bluer_ugv-7.421.1/bluer_ugv/help/swallow/video/functions.py

@@ -0,0 +1,41 @@
+from typing import List
+
+from bluer_options.terminal import show_usage, xtra
+
+from bluer_ugv import env
+from bluer_ugv.help.swallow.video.playlist import help_functions as help_playlist
+from bluer_ugv.swallow.session.classical.screen.video.engine import VideoEngine
+
+
+def help_play(
+    tokens: List[str],
+    mono: bool,
+) -> str:
+    args = [
+        "[--dryrun 1]",
+        "[--download 0]",
+        "[--engine {}]".format(
+            " | ".join(sorted([engine.name.lower() for engine in VideoEngine]))
+        ),
+        "[--loop 0]",
+        f"[--object_name <{env.RANGIN_VIDEO_LIST_OBJECT}>]",
+        "[--timeout <-1 | 10>]",
+        "[--video <loading|1>]",
+    ]
+
+    return show_usage(
+        [
+            "@swallow",
+            "video",
+            "play",
+        ]
+        + args,
+        "play <object-name>/<video>.",
+        mono=mono,
+    )
+
+
+help_functions = {
+    "play": help_play,
+    "playlist": help_playlist,
+}

bluer_ugv-7.421.1/bluer_ugv/help/swallow/video/playlist.py

@@ -0,0 +1,89 @@
+from typing import List
+
+from bluer_options.terminal import show_usage, xtra
+from bluer_objects.help.download import options as download_options
+from bluer_objects.help.upload import options as upload_options
+
+
+def help_cat(
+    tokens: List[str],
+    mono: bool,
+) -> str:
+    options = xtra("download", mono=mono)
+
+    return show_usage(
+        [
+            "@swallow",
+            "video",
+            "playlist",
+            "cat",
+            f"[{options}]",
+        ],
+        "cat swallow playlist.",
+        mono=mono,
+    )
+
+
+def help_download(
+    tokens: List[str],
+    mono: bool,
+) -> str:
+    options = download_options(mono=mono)
+
+    return show_usage(
+        [
+            "@swallow",
+            "video",
+            "playlist",
+            "download",
+            f"[{options}]",
+        ],
+        "download swallow playlist.",
+        mono=mono,
+    )
+
+
+def help_edit(
+    tokens: List[str],
+    mono: bool,
+) -> str:
+    options = xtra("download", mono=mono)
+
+    return show_usage(
+        [
+            "@swallow",
+            "video",
+            "playlist",
+            "edit",
+            f"[{options}]",
+        ],
+        "edit swallow playlist.",
+        mono=mono,
+    )
+
+
+def help_upload(
+    tokens: List[str],
+    mono: bool,
+) -> str:
+    options = upload_options(mono=mono)
+
+    return show_usage(
+        [
+            "@swallow",
+            "video",
+            "playlist",
+            "upload",
+            f"[{options}]",
+        ],
+        "upload swallow playlist.",
+        mono=mono,
+    )
+
+
+help_functions = {
+    "cat": help_cat,
+    "download": help_download,
+    "edit": help_edit,
+    "upload": help_upload,
+}

bluer_ugv-7.421.1/bluer_ugv/swallow/session/classical/screen/classes.py

@@ -0,0 +1,42 @@
+from bluer_options.host.functions import is_headless
+
+from bluer_ugv import env
+from bluer_ugv.swallow.session.classical.screen.video.player import VideoPlayer
+from bluer_ugv.swallow.session.classical.screen.video.playlist import PlayList
+from bluer_ugv.logger import logger
+
+
+class ClassicalScreen:
+    def __init__(self):
+        self.video_player = None if is_headless() else VideoPlayer()
+
+        self.playlist = PlayList(env.RANGIN_VIDEO_LIST_OBJECT)
+
+        logger.info(f"{self.__class__.__name__} created.")
+
+    def cleanup(self):
+        logger.info(f"{self.__class__.__name__}.cleanup")
+        self.video_player.stop()
+
+    def initialize(self) -> bool:
+        if self.video_player is None:
+            return True
+
+        return self.video_player.play(
+            self.playlist.get("loading"),
+            loop=True,
+        )
+
+    def update(self) -> bool:
+        if self.video_player is None:
+            return True
+
+        if self.video_player.process:
+            return True
+
+        self.playlist.next()
+
+        return self.video_player.play(
+            self.playlist.get(self.playlist.index),
+            loop=False,
+        )

bluer_ugv-7.421.1/bluer_ugv/swallow/session/classical/screen/video/__main__.py

@@ -0,0 +1,99 @@
+import argparse
+import time
+
+from blueness import module
+from blueness.argparse.generic import sys_exit
+from bluer_options.host import is_rpi, is_headless
+from bluer_options import string
+
+from bluer_ugv import NAME, env
+from bluer_ugv.swallow.session.classical.screen.video.playlist import PlayList
+from bluer_ugv.swallow.session.classical.screen.video.player import VideoPlayer
+from bluer_ugv.swallow.session.classical.screen.video.engine import VideoEngine
+from bluer_ugv.logger import logger
+
+NAME = module.name(__file__, NAME)
+
+parser = argparse.ArgumentParser(NAME)
+parser.add_argument(
+    "task",
+    type=str,
+    help="play",
+)
+parser.add_argument(
+    "--download",
+    type=int,
+    default=1,
+    help="0|1",
+)
+parser.add_argument(
+    "--dryrun",
+    type=int,
+    default=int(not is_rpi() or is_headless()),
+    help="0|1",
+)
+parser.add_argument(
+    "--engine",
+    type=str,
+    default=VideoEngine.VLC.name.lower(),
+    help=" | ".join(sorted([engine.name.lower() for engine in VideoEngine])),
+)
+parser.add_argument(
+    "--loop",
+    type=int,
+    default=1,
+    help="0|1",
+)
+parser.add_argument(
+    "--object_name",
+    type=str,
+    default=env.RANGIN_VIDEO_LIST_OBJECT,
+)
+parser.add_argument(
+    "--timeout",
+    type=int,
+    default=-1,
+    help="in seconds, -1: never",
+)
+parser.add_argument(
+    "--video",
+    type=str,
+    default="loading",
+)
+args = parser.parse_args()
+
+
+success = False
+if args.task == "play":
+    playlist = PlayList(
+        args.object_name,
+        download=args.download == 1,
+    )
+
+    video_player = VideoPlayer(
+        args.dryrun == 1,
+        engine=VideoEngine[args.engine.upper()],
+    )
+
+    success = video_player.play(
+        filename=playlist.get(args.video),
+        loop=args.loop == 1,
+    )
+
+    if success and args.timeout > 0:
+        logger.info(
+            "waiting for {}".format(
+                string.pretty_duration(
+                    args.timeout,
+                )
+            )
+        )
+        time.sleep(args.timeout)
+        success = video_player.stop()
+
+        logger.info('💡 type in "reset" if the prompt is invisible.')
+
+else:
+    success = None
+
+sys_exit(logger, NAME, args.task, success)

bluer_ugv-7.421.1/bluer_ugv/swallow/session/classical/screen/video/engine.py

@@ -0,0 +1,125 @@
+import shlex
+from enum import Enum, auto
+import subprocess
+import time
+import socket
+
+from bluer_objects.graphics.screen import get_size
+from bluer_ugv.logger import logger
+
+
+class VideoEngine(Enum):
+    MPV = auto()
+    VLC = auto()
+
+    def pause(self, process: subprocess.Popen):
+        # MPV: use stdin
+        if self == VideoEngine.MPV:
+            try:
+                if not process.stdin:
+                    logger.error("mpv pause failed: no stdin")
+                    return False
+                process.stdin.write(b"p")
+                process.stdin.flush()
+            except Exception as e:
+                logger.error(f"mpv pause exception: {e}")
+                return False
+            return True
+
+        # VLC: use RC TCP
+        if self == VideoEngine.VLC:
+            try:
+                s = socket.create_connection(("127.0.0.1", 41940), 0.5)
+                s.sendall(b"pause\n")
+                s.close()
+                return True
+            except Exception as e:
+                logger.error(f"vlc pause failed: {e}")
+                return False
+
+        logger.error(f"{self}: unknown video engine.")
+        return False
+
+    def play_command(
+        self,
+        filename: str,
+        fullscreen: bool = True,
+        loop: bool = False,
+        audio: bool = False,
+    ) -> str:
+        screen_height, screen_width = get_size()
+        logger.info("screen size: {}x{}".format(screen_height, screen_width))
+
+        if self == VideoEngine.MPV:
+            logger.info('press "q" to quit mpv.')
+
+            return " ".join(
+                [
+                    "mpv",
+                    "--no-border",
+                    "--background=black",  # FIXED
+                    "--keepaspect=yes",
+                    "--no-keepaspect-window",
+                    "--geometry=0:0",
+                    (f"--autofit={screen_width}x{screen_height}" if fullscreen else ""),
+                    "--loop" if loop else "",
+                    "--no-audio" if not audio else "",
+                    shlex.quote(filename),
+                ]
+            )
+
+        if self == VideoEngine.VLC:
+            logger.info('press "Enter" to quit vlc.')
+
+            return " ".join(
+                [
+                    "sudo -u pi",
+                    "cvlc",
+                    "--fullscreen",
+                    "--no-video-title-show",
+                    "--video-on-top",
+                    "--no-osd",
+                    "--loop" if loop else "",
+                    "--no-audio" if not audio else "",
+                    "--extraintf",
+                    "rc",
+                    "--rc-host=127.0.0.1:41940",
+                    shlex.quote(filename),
+                ]
+            )
+
+        return "this-should-not-happen"
+
+    def stop(
+        self,
+        process: subprocess.Popen,
+    ) -> bool:
+        if self == VideoEngine.MPV:
+            try:
+                if process.stdin:
+                    process.stdin.write(b"q")
+                    process.stdin.flush()
+            except Exception as e:
+                logger.error(f"mpv quit failed: {e}")
+                return False
+
+        if self == VideoEngine.VLC:
+            try:
+                s = socket.create_connection(("127.0.0.1", 41940), 0.5)
+                s.sendall(b"quit\n")
+                s.close()
+                logger.info("vlc: sent 'quit' via TCP RC.")
+            except Exception as e:
+                logger.error(f"vlc rc quit failed: {e}")
+                return False
+
+        time.sleep(0.3)
+
+        try:
+            if process.poll() is None:
+                process.kill()
+        except Exception as e:
+            logger.warning(f"process.kill failed: {e}")
+            return False
+
+        return True