kaskade 2.2.0__tar.gz → 2.3.0__tar.gz

{kaskade-2.2.0 → kaskade-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kaskade
-Version: 2.2.0
+Version: 2.3.0
 Summary: kaskade is a terminal user interface for kafka
 Home-page: https://github.com/sauljabin/kaskade
 License: MIT
@@ -23,16 +23,21 @@ Project-URL: Documentation, https://github.com/sauljabin/kaskade
 Project-URL: Repository, https://github.com/sauljabin/kaskade
 Description-Content-Type: text/markdown
 
-<p align="center"><a href="https://github.com/sauljabin/kaskade"><img alt="kaskade" width="400" src="https://raw.githubusercontent.com/sauljabin/kaskade/main/screenshots/banner.png"></a></p>
+<p align="center">
+<a href="https://github.com/sauljabin/kaskade"><img alt="kaskade" width="400" src="https://raw.githubusercontent.com/sauljabin/kaskade/main/screenshots/banner.png"></a>
+</p>
 
+<p align="center">
 <a href="https://github.com/sauljabin/kaskade"><img alt="GitHub" src="https://img.shields.io/badge/github-blueviolet?logo=github&logoColor=white"></a>
-<a href="https://hub.docker.com/r/sauljabin/kaskade"><img alt="DockerHub" src="https://img.shields.io/badge/docker-blue?logo=docker&logoColor=white"></a>
 <a href="https://github.com/sponsors/sauljabin"><img alt="donate" src="https://img.shields.io/badge/donate-EA4AAA?logo=github-sponsors&logoColor=white"></a>
-<a href="https://libraries.io/pypi/kaskade"><img alt="Libraries.io dependency status for latest release" src="https://img.shields.io/librariesio/release/pypi/kaskade?label="></a>
+<a href="https://libraries.io/pypi/kaskade"><img alt="Libraries.io dependency status for latest release" src="https://img.shields.io/librariesio/release/pypi/kaskade?logo=python&logoColor=white&label="></a>
 <a href="https://github.com/sauljabin/kaskade/blob/main/LICENSE"><img alt="MIT License" src="https://img.shields.io/github/license/sauljabin/kaskade"></a>
-<a href="https://pypi.org/project/kaskade"><img alt="Version" src="https://img.shields.io/pypi/v/kaskade?label=latest"></a>
-<a href="https://pypi.org/project/kaskade"><img alt="Python Versions" src="https://img.shields.io/pypi/pyversions/kaskade?label=python"></a>
+<a href="https://pypi.org/project/kaskade"><img alt="Pypi Version" src="https://img.shields.io/pypi/v/kaskade"></a>
+<a href="https://formulae.brew.sh/formula/kaskade"><img alt="Homebrew Version" src="https://img.shields.io/homebrew/v/kaskade"></a>
+<a href="https://hub.docker.com/r/sauljabin/kaskade/tags"><img alt="Docker Version" src="https://img.shields.io/docker/v/sauljabin/kaskade?label=dockerhub"></a>
 <a href="https://pypi.org/project/kaskade"><img alt="Platform" src="https://img.shields.io/badge/os-linux%20%7C%20macos-blue"></a>
+<a href="https://pypi.org/project/kaskade"><img alt="Python Versions" src="https://img.shields.io/pypi/pyversions/kaskade?label=python"></a>
+</p>
 
 ## Kaskade
 
@@ -73,8 +78,6 @@ by [Textualize](https://www.textualize.io/). It includes features like:
 
 ## Installation
 
-These will install `kaskade` and `kskd` aliases.
-
 #### Install it with `brew`:
 
 ```bash
@@ -195,7 +198,7 @@ Generate a _Descriptor Set_ file from your `.proto` file:
 
 ```bash
 protoc --include_imports \
-       --descriptor_set_out=./my-descriptor.desc \
+       --descriptor_set_out=my-descriptor.desc \
        --proto_path=${PROTO_PATH} \
        ${PROTO_PATH}/my-proto.proto
 ```

{kaskade-2.2.0 → kaskade-2.3.0}/README.md

@@ -1,13 +1,18 @@
-<p align="center"><a href="https://github.com/sauljabin/kaskade"><img alt="kaskade" width="400" src="https://raw.githubusercontent.com/sauljabin/kaskade/main/screenshots/banner.png"></a></p>
+<p align="center">
+<a href="https://github.com/sauljabin/kaskade"><img alt="kaskade" width="400" src="https://raw.githubusercontent.com/sauljabin/kaskade/main/screenshots/banner.png"></a>
+</p>
 
+<p align="center">
 <a href="https://github.com/sauljabin/kaskade"><img alt="GitHub" src="https://img.shields.io/badge/github-blueviolet?logo=github&logoColor=white"></a>
-<a href="https://hub.docker.com/r/sauljabin/kaskade"><img alt="DockerHub" src="https://img.shields.io/badge/docker-blue?logo=docker&logoColor=white"></a>
 <a href="https://github.com/sponsors/sauljabin"><img alt="donate" src="https://img.shields.io/badge/donate-EA4AAA?logo=github-sponsors&logoColor=white"></a>
-<a href="https://libraries.io/pypi/kaskade"><img alt="Libraries.io dependency status for latest release" src="https://img.shields.io/librariesio/release/pypi/kaskade?label="></a>
+<a href="https://libraries.io/pypi/kaskade"><img alt="Libraries.io dependency status for latest release" src="https://img.shields.io/librariesio/release/pypi/kaskade?logo=python&logoColor=white&label="></a>
 <a href="https://github.com/sauljabin/kaskade/blob/main/LICENSE"><img alt="MIT License" src="https://img.shields.io/github/license/sauljabin/kaskade"></a>
-<a href="https://pypi.org/project/kaskade"><img alt="Version" src="https://img.shields.io/pypi/v/kaskade?label=latest"></a>
-<a href="https://pypi.org/project/kaskade"><img alt="Python Versions" src="https://img.shields.io/pypi/pyversions/kaskade?label=python"></a>
+<a href="https://pypi.org/project/kaskade"><img alt="Pypi Version" src="https://img.shields.io/pypi/v/kaskade"></a>
+<a href="https://formulae.brew.sh/formula/kaskade"><img alt="Homebrew Version" src="https://img.shields.io/homebrew/v/kaskade"></a>
+<a href="https://hub.docker.com/r/sauljabin/kaskade/tags"><img alt="Docker Version" src="https://img.shields.io/docker/v/sauljabin/kaskade?label=dockerhub"></a>
 <a href="https://pypi.org/project/kaskade"><img alt="Platform" src="https://img.shields.io/badge/os-linux%20%7C%20macos-blue"></a>
+<a href="https://pypi.org/project/kaskade"><img alt="Python Versions" src="https://img.shields.io/pypi/pyversions/kaskade?label=python"></a>
+</p>
 
 ## Kaskade
 
@@ -48,8 +53,6 @@ by [Textualize](https://www.textualize.io/). It includes features like:
 
 ## Installation
 
-These will install `kaskade` and `kskd` aliases.
-
 #### Install it with `brew`:
 
 ```bash
@@ -170,7 +173,7 @@ Generate a _Descriptor Set_ file from your `.proto` file:
 
 ```bash
 protoc --include_imports \
-       --descriptor_set_out=./my-descriptor.desc \
+       --descriptor_set_out=my-descriptor.desc \
        --proto_path=${PROTO_PATH} \
        ${PROTO_PATH}/my-proto.proto
 ```

{kaskade-2.2.0 → kaskade-2.3.0}/kaskade/__init__.py

@@ -3,19 +3,12 @@ from importlib.metadata import version
 from pathlib import Path
 
 APP_NAME = "kaskade"
-APP_NAME_SHORT = "kskd"
 __version__ = APP_VERSION = version(APP_NAME)
 APP_BANNER = r""" _             _             _
 | | ____ _ ___| | ____ _  __| | ___
 | |/ / _` / __| |/ / _` |/ _` |/ _ \
 |   < (_| \__ \   < (_| | (_| |  __/
 |_|\_\__,_|___/_|\_\__,_|\__,_|\___|"""
-APP_BANNER_SHORT = r""" _        _       _
-| | _____| | ____| |
-| |/ / __| |/ / _` |
-|   <\__ \   < (_| |
-|_|\_\___/_|\_\__,_|"""
-
 
 path_home = Path.home()
 kaskade_path = path_home.joinpath("." + APP_NAME)

{kaskade-2.2.0 → kaskade-2.3.0}/kaskade/admin.py

@@ -40,17 +40,17 @@ REFRESH_TOPICS_SHORTCUT = "ctrl+r"
 QUIT_SHORTCUT = "ctrl+c"
 
 
-class Shortcuts(Widget):
+class AdminShortcuts(Widget):
 
     SHORTCUTS = [
-        ["all:", BACK_SHORTCUT, "describe:", SUBMIT_SHORTCUT],
+        ["all:", BACK_SHORTCUT, "show:", SUBMIT_SHORTCUT],
         ["refresh:", REFRESH_TOPICS_SHORTCUT, "create:", NEW_TOPIC_SHORTCUT],
         ["filter:", FILTER_TOPICS_SHORTCUT, "edit:", EDIT_TOPIC_SHORTCUT],
         ["quit:", QUIT_SHORTCUT, "delete:", DELETE_TOPIC_SHORTCUT],
     ]
 
     def render(self) -> RenderResult:
-        table = Table(box=None, show_header=False, padding=(0, 1, 0, 0))
+        table = Table(box=None, show_header=False, padding=(0, 0, 0, 1))
         table.add_column(style=PRIMARY)
         table.add_column(style=SECONDARY)
         table.add_column(style=PRIMARY)
@@ -65,8 +65,8 @@ class Shortcuts(Widget):
 class Header(Widget):
 
     def compose(self) -> ComposeResult:
-        yield KaskadeBanner(short=True, include_version=True, include_slogan=False)
-        yield Shortcuts()
+        yield AdminShortcuts()
+        yield KaskadeBanner(include_version=True, include_slogan=False)
 
 
 class FilterTopicsScreen(ModalScreen[str]):

{kaskade-2.2.0 → kaskade-2.3.0}/kaskade/banner.py

@@ -2,22 +2,19 @@ from rich.console import Group
 from rich.text import Text
 from textual.widget import Widget
 
-from kaskade import APP_BANNER_SHORT, APP_BANNER, APP_VERSION
+from kaskade import APP_BANNER, APP_VERSION
 from kaskade.colors import PRIMARY, SECONDARY
 
 
 class KaskadeBanner(Widget):
-    def __init__(
-        self, *, include_version: bool = False, include_slogan: bool = False, short: bool = False
-    ):
+    def __init__(self, *, include_version: bool = False, include_slogan: bool = False):
         super().__init__()
         self.include_slogan = include_slogan
         self.include_version = include_version
-        self.short = short
 
     def render(self) -> Group:
         kaskade_name = Text(
-            APP_BANNER_SHORT if self.short else APP_BANNER,
+            APP_BANNER,
             style=f"{PRIMARY} bold",
         )
         version_text = Text("", justify="right")

{kaskade-2.2.0 → kaskade-2.3.0}/kaskade/consumer.py

@@ -26,18 +26,23 @@ BACK_SHORTCUT = "escape"
 FILTER_SHORTCUT = "/"
 
 
-class Shortcuts(Widget):
+class ConsumerShortcuts(Widget):
+
+    SHORTCUTS = [
+        ["all:", BACK_SHORTCUT, "show:", SUBMIT_SHORTCUT],
+        ["more:", NEXT_SHORTCUT, "filter:", FILTER_SHORTCUT],
+        ["quit:", QUIT_SHORTCUT, "chunk:", CHUNKS_SHORTCUT],
+    ]
 
     def render(self) -> RenderResult:
-        table = Table(box=None, show_header=False, padding=(0, 1, 0, 0))
+        table = Table(box=None, show_header=False, padding=(0, 0, 0, 1))
+        table.add_column(style=PRIMARY)
+        table.add_column(style=SECONDARY)
         table.add_column(style=PRIMARY)
         table.add_column(style=SECONDARY)
 
-        table.add_row("show:", SUBMIT_SHORTCUT)
-        table.add_row("more:", NEXT_SHORTCUT)
-        table.add_row("filter:", FILTER_SHORTCUT)
-        table.add_row("chunk:", CHUNKS_SHORTCUT)
-        table.add_row("quit:", QUIT_SHORTCUT)
+        for shortcuts in self.SHORTCUTS:
+            table.add_row(*shortcuts)
 
         return table
 
@@ -45,8 +50,8 @@ class Shortcuts(Widget):
 class Header(Widget):
 
     def compose(self) -> ComposeResult:
-        yield KaskadeBanner(short=True, include_version=True, include_slogan=False)
-        yield Shortcuts()
+        yield ConsumerShortcuts()
+        yield KaskadeBanner(include_version=True, include_slogan=False)
 
 
 class FilterRecordScreen(ModalScreen[tuple[str, str, str, str]]):
@@ -159,6 +164,7 @@ class ListRecords(Container):
         Binding(CHUNKS_SHORTCUT, "change_chunk"),
         Binding(FILTER_SHORTCUT, "filter"),
         Binding(SUBMIT_SHORTCUT, "show_message", priority=True),
+        Binding(BACK_SHORTCUT, "all"),
     ]
 
     def __init__(
@@ -234,6 +240,15 @@ class ListRecords(Container):
     def on_mount(self) -> None:
         self.run_worker(self.action_consume())
 
+    def action_all(self) -> None:
+        self.key_filter, self.value_filter, self.partition_filter, self.header_filter = (
+            "",
+            "",
+            "",
+            "",
+        )
+        self._filter()
+
     def action_filter(self) -> None:
         def dismiss(result: tuple[str, str, str, str] | None) -> None:
             if result is None:

{kaskade-2.2.0 → kaskade-2.3.0}/kaskade/deserializers.py

@@ -126,12 +126,12 @@ class ProtobufDeserializer(Deserializer):
 
         if context == MessageField.KEY:
             if self.key_class is None:
-                raise Exception("Protobuf class name not provided for context KEY")
+                raise Exception("Protobuf message name not provided for context KEY")
             deserialization_class = self.descriptor_classes.get(self.key_class)
 
         if context == MessageField.VALUE:
             if self.value_class is None:
-                raise Exception("Protobuf class name not provided for context VALUE")
+                raise Exception("Protobuf message name not provided for context VALUE")
             deserialization_class = self.descriptor_classes.get(self.value_class)
 
         if deserialization_class is None:

{kaskade-2.2.0 → kaskade-2.3.0}/kaskade/main.py

@@ -139,7 +139,7 @@ def admin(
         "-p",
         "protobuf_config",
         help="Protobuf property. Configure the protobuf deserializer. Multiple '-p' are allowed. Needed if '-k protobuf' "
-        "or '-v protobuf' were passed. Valid properties: [descriptor, key, value].",
+        "or '-v protobuf' were passed. Valid properties: [descriptor: file path, key: protobuf message, value: protobuf message].",
         metavar="property=value",
         multiple=True,
         callback=tuple_properties_to_dict,

{kaskade-2.2.0 → kaskade-2.3.0}/kaskade/styles.css

@@ -9,13 +9,20 @@ Header {
 }
 
 KaskadeBanner {
+    width: 36;
+    margin: 0 0 0 1;
+}
+
+ConsumerShortcuts {
+    width: 27;
     dock: right;
-    width: 20;
-    margin: 0 1 0 0;
+    margin: 1 1 0 0;
 }
 
-Shortcuts {
-    margin: 0 0 0 1;
+AdminShortcuts {
+    width: 31;
+    dock: right;
+    margin: 1 1 0 0;
 }
 
 DataTable {

{kaskade-2.2.0 → kaskade-2.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kaskade"
-version = "2.2.0"
+version = "2.3.0"
 description = "kaskade is a terminal user interface for kafka"
 authors = ["Saúl Piña <sauljabin@gmail.com>"]
 license = "MIT"
@@ -51,4 +51,3 @@ line-length = 100
 
 [tool.poetry.scripts]
 kaskade = "kaskade.main:cli"
-kskd = "kaskade.main:cli"