nostromo 0.dev0__tar.gz → 0.dev1__tar.gz

{nostromo-0.dev0 → nostromo-0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nostromo
-Version: 0.dev0
+Version: 0.dev1
 Summary: pipeline builder, runner, process manager, background jobs, job scheduling
 License: MIT
 Author: Danila Ganchar
@@ -13,14 +13,17 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: bigtree (>=0.22.3,<0.23.0)
+Requires-Dist: func-timeout (>=4.3.5,<5.0.0)
 Requires-Dist: inject (==4.1)
 Requires-Dist: psutil (>=6.1.0,<7.0.0)
 Requires-Dist: pypyr (==5.9.1)
 Requires-Dist: pyyaml (>=6.0.1,<7.0.0)
 Requires-Dist: redis (==5.0.1)
-Requires-Dist: saq[redis] (>=0.18.3,<0.19.0)
+Requires-Dist: saq[hiredis,web] (>=0.18.3,<0.19.0)
 Requires-Dist: setuptools (>=70.2.0,<71.0.0)
+Requires-Dist: starlette (>=0.41.3,<0.42.0)
 Requires-Dist: textual (==0.85.2)
+Requires-Dist: typer (>=0.13.1,<0.14.0)
 Description-Content-Type: text/markdown
 
 

nostromo-0.dev1/nostromo/app.py

@@ -0,0 +1,140 @@
+from asyncio import sleep
+from typing import Callable
+
+import inject
+from rich.text import TextType
+from textual import work
+from textual.app import App, ComposeResult
+from textual.widget import Widget
+from textual.widgets import Footer, Tab, Tabs
+
+from .protocols.ui_log import UILogProtocol
+from .screens.logs import LogsScreen
+from .tabs.pipeline_editor import PipelineEditorContent
+from .tabs.pipelines import PipelienesContent
+
+
+class _MainTabs(Tabs):
+    DEFAULT_CSS = """
+    _MainTabs {layer: below; opacity: 0.5 !important}
+    _MainTabs .underline--bar {background: orange 50% !important; color: orange !important}
+    _MainTabs Tab {opacity: 0.6; color: #4577D4}
+    _MainTabs Tab.-active, _MainTabs Tab.-active:hover {opacity: 1; color: orange !important}
+    """
+
+    def __init__(self, *tabs: Tab | TextType, active: str | None = None, name: str | None = None, id: str | None = None,
+                 classes: str | None = None, disabled: bool = False, on_tab_callback: Callable):
+        super().__init__(*tabs, active=active, name=name, id=id, classes=classes, disabled=disabled)
+        self._on_tab_callback = on_tab_callback
+
+    def watch_active(self, previously_active: str, active: str) -> None:
+        super().watch_active(previously_active, active)
+        self._on_tab_callback(active)
+
+    @property
+    def default_opacity(self) -> float:
+        return 0.5
+
+    def on_focus(self) -> None:
+        # visual loading
+        self.__on_focus()
+
+    @work(exclusive=True)
+    async def __on_focus(self):
+        for tab in self.query(Tab):
+            tab.disabled = False
+
+        content = self.loaded_content
+        self.styles.animate('opacity', value=100, duration=0.2)
+        content.styles.animate('opacity', value=0.6, duration=0.2)
+        await sleep(0.2)
+        self.styles.opacity = 100
+        content.styles.opacity = 0.6
+
+    def on_blur(self) -> None:
+        self.__on_blur()
+
+    @work(exclusive=True)
+    async def __on_blur(self):
+        # visual loading
+        loaded = self.loaded_content
+        while loaded.styles.opacity != 0.6:
+            await sleep(0.21)
+
+        self.styles.animate('opacity', value=self.default_opacity, duration=0.1)
+        await sleep(0.1)
+        self.styles.opacity = self.default_opacity
+        loaded.styles.opacity = 100
+
+    @property
+    def loaded_content(self) -> Widget:
+        return self.parent.query_one(TabContent).children[0]
+
+
+class TabContent(Widget):
+    DEFAULT_CSS = """
+    TabContent {padding: 1 1 1 1; opacity: 60 !important}
+    """
+
+
+class Nostromo(App):
+    _log = inject.attr(UILogProtocol)
+    _tab_content = TabContent()
+    DEFAULT_CSS = """
+    Screen {layers: below above; scrollbar-size-vertical: 1 !important; scrollbar-color: #4577D4 20% !important}
+    Label {color: #c7c9ca; text-style: bold}
+    .-textual-loading-indicator {background: #1e1e1e!important; color: orange}
+    .vl {layout: vertical; height: auto}
+    .hl {layout: horizontal; height: auto}
+    .bg {background: #1e1e1e !important}
+    Switch:focus, Switch:hover { border: solid #4577D4 60% !important}
+    Switch.-on > .switch--slider { color: #00AF64 !important }
+    """
+
+    SCREENS = {'logs': LogsScreen}
+    BINDINGS = [
+        ('ctrl+l', 'push_screen("logs")', 'Logs'),
+    ]
+
+    def compose(self) -> ComposeResult:
+        yield _MainTabs(
+            Tab(PipelienesContent.get_id(), id=PipelienesContent.get_id(), disabled=False),
+            Tab('Pipeline Editor', id=PipelineEditorContent.get_id(), disabled=False),
+            on_tab_callback=self.open_tab,
+        )
+
+        self._tab_content.styles.layer = 'below'
+        self._tab_content.display = 'none'  # visual loading
+        yield self._tab_content
+        yield Footer()
+        self.open_tab(PipelienesContent.get_id())
+
+    @work(exclusive=True)
+    async def open_tab(self, tab_id: str):
+        # inject + mount waiting
+        while not self._tab_content or not self._tab_content.is_mounted:
+            await sleep(0.2)
+            break
+        # mounted
+
+        await self._tab_content.remove_children()
+        self._tab_content.display = 'block'  # visual loading
+        self._tab_content.set_loading(True)
+
+        for tab_content in (
+            PipelienesContent,
+            PipelineEditorContent,
+        ):
+            if tab_content.get_id() != tab_id:
+                continue
+
+            content = tab_content()
+            content.styles.opacity = 0
+            await self._tab_content.mount(content)
+            await sleep(0.3)  # visual loading
+            self._tab_content.set_loading(False)
+
+            content.styles.animate('opacity', value=0.6, duration=0.2)
+            await sleep(0.2)  # visual loading
+            content.styles.opacity = 0.6
+            break

nostromo-0.dev1/nostromo/injector.py

@@ -0,0 +1,33 @@
+import os
+
+import inject
+from textual.widgets import RichLog
+import redis.asyncio as redis
+
+from .protocols.executor import ExecutorProtocol
+from .protocols.path import PathProtocol
+from .protocols.pipelines import PipelinesProtocol, PipelineStorageProtocol
+from .protocols.ui_log import UILogProtocol
+from .services.local_path import LocalPath
+from .services.pypyr_pipelines import PypyrPipelines
+from .services.redis_executor import RedisExecutor
+from .services.redis_pipeline_storage import RedisPipelineStorage
+from .services.rich_ui_log import RichUILogService
+
+
+def default_config(binder: inject.Binder):
+    pool = redis.ConnectionPool.from_url(os.environ['NOSTROMO_REDIS_URL'])
+    client = redis.Redis.from_pool(pool)
+    binder.bind_to_constructor(PathProtocol, lambda: LocalPath())
+    binder.bind_to_constructor(PipelineStorageProtocol, lambda: RedisPipelineStorage(client))
+    binder.bind_to_constructor(ExecutorProtocol, lambda: RedisExecutor(os.environ['NOSTROMO_REDIS_URL']))
+
+
+def ui_config(binder: inject.Binder):
+    binder.install(default_config)
+
+    pool = redis.ConnectionPool.from_url(os.environ['NOSTROMO_REDIS_URL'])
+    client = redis.Redis.from_pool(pool)
+
+    binder.bind_to_constructor(PipelinesProtocol, lambda: PypyrPipelines(client))
+    binder.bind_to_constructor(UILogProtocol, lambda: RichUILogService(RichLog(highlight=True, markup=True)))

{nostromo-0.dev0 → nostromo-0.dev1}/nostromo/protocols/path.py

@@ -43,3 +43,7 @@ class PathProtocol(Protocol, metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def scheduler_logs(self) -> Path:
         pass
+
+    @abc.abstractmethod
+    def ensure_log_dirs(self):
+        pass

nostromo-0.dev1/nostromo/protocols/pipeline_editor.py

@@ -0,0 +1,10 @@
+import abc
+from typing import Protocol
+
+from ..models.pipeline import Pipeline
+
+
+class PipelineEditorProtocol(Protocol, metaclass=abc.ABCMeta):
+    @abc.abstractmethod
+    def create_pipeline(self, pipeline: str) -> Pipeline:
+        pass

{nostromo-0.dev0 → nostromo-0.dev1}/nostromo/protocols/pipelines.py

@@ -44,3 +44,8 @@ class PipelinesProtocol(Protocol, metaclass=abc.ABCMeta):
 
     async def kill_pipeline(self, run: PipelineRun) -> PipelineRun:
         pass
+
+
+class PipelineStorageProtocol(Protocol, metaclass=abc.ABCMeta):
+    async def get_pipelines(self) -> List[Pipeline]:
+        pass

nostromo-0.dev1/nostromo/run.py

@@ -0,0 +1,60 @@
+from os import environ, makedirs
+from pathlib import PosixPath
+
+import func_timeout
+import inject
+import typer
+from func_timeout import FunctionTimedOut
+from redis import Redis
+
+from .app import Nostromo
+from .injector import ui_config
+
+
+class Runner:
+    def _check_redis(self):
+        if not environ.get('NOSTROMO_REDIS_URL'):
+            environ['NOSTROMO_REDIS_URL'] = 'redis://localhost'
+
+        Redis.from_url(environ['NOSTROMO_REDIS_URL']).ping()
+
+    def _validate(self):
+        if not environ.get('NOSTROMO_HOME'):
+            environ['NOSTROMO_HOME'] = '~/.nostromo'
+
+        full_path = PosixPath(environ['NOSTROMO_HOME']).expanduser()
+        makedirs(full_path, exist_ok=True)
+
+        try:
+            func_timeout.func_timeout(2, self._check_redis, )
+        except FunctionTimedOut:
+            print(f'Redis connection error. Check connection or modify NOSTROMO_REDIS_URL variable')
+            exit(1)
+
+    def run_ui(self):
+        self._validate()
+        inject.configure(ui_config)
+        Nostromo().run(mouse=False)
+
+    def run_scheduler(self):
+        self._validate()
+
+
+app = typer.Typer(
+    help='Default env variables: NOSTROMO_HOME=~/.nostromo, NOSTROMO_REDIS_URL=redis://localhost',
+    add_completion=False,
+)
+
+
+@app.command(help='open terminal')
+def ui():
+    Runner().run_ui()
+
+
+@app.command(help='run scheduler')
+def scheduler():
+    Runner().run_scheduler()
+
+
+if __name__ == "__main__":
+    app()

{nostromo-0.dev0 → nostromo-0.dev1}/nostromo/screens/logs.py

@@ -3,7 +3,7 @@ from textual.app import ComposeResult
 from textual.screen import Screen
 from textual.widgets import Footer
 
-from nostromo.protocols.ui_log import UILogProtocol
+from ..protocols.ui_log import UILogProtocol
 
 
 class LogsScreen(Screen):

{nostromo-0.dev0 → nostromo-0.dev1}/nostromo/services/local_path.py

@@ -2,7 +2,7 @@ import abc
 import os
 from pathlib import Path, PosixPath
 
-from nostromo.protocols.path import PathProtocol
+from ..protocols.path import PathProtocol
 
 
 class LocalPath(PathProtocol, metaclass=abc.ABCMeta):
@@ -53,3 +53,11 @@ class LocalPath(PathProtocol, metaclass=abc.ABCMeta):
     @property
     def scheduler_logs(self) -> Path:
         return self._scheduler_logs
+
+    def ensure_log_dirs(self):
+        for dir_path in (
+            self.logs,
+            self.pipelines_logs,
+            self.scheduler_logs,
+        ):
+            os.makedirs(dir_path, exist_ok=True)

{nostromo-0.dev0 → nostromo-0.dev1}/nostromo/services/pypyr_pipelines.py

@@ -2,13 +2,12 @@ import codecs
 import json
 import os
 import subprocess
-from datetime import datetime, UTC, timezone
+from datetime import datetime, UTC
 from typing import List, Dict
 
 import inject
 import psutil
 import yaml
-from dotenv import dotenv_values
 from psutil import NoSuchProcess
 from redis.asyncio import Redis
 
@@ -73,7 +72,7 @@ class PypyrPipelines(PipelinesProtocol):
         return sorted(result)
 
     def get_nostromo_env(self) -> Dict[str, str]:
-        config = dotenv_values(str(self._paths.env_file))
+        config = {}
         config['NOSTOMO_HOME'] = os.environ.get('NOSTOMO_HOME')
         return dict(sorted(config.items(), key=lambda x: x[0]))
 
@@ -86,6 +85,7 @@ class PypyrPipelines(PipelinesProtocol):
             return Pipeline(**params)
 
     def get_pipelines(self) -> List[Pipeline]:
+        return []
         return [
             self._load_pipeline_from_yml(p)
             for p in os.listdir(self._paths.pipelines)

nostromo-0.dev1/nostromo/services/redis_pipeline_storage.py

@@ -0,0 +1,22 @@
+from asyncio import sleep
+from typing import List
+from redis.asyncio import Redis
+from ..models.pipeline import Pipeline
+from ..protocols.pipelines import PipelineStorageProtocol
+
+
+class RedisPipelineStorage(PipelineStorageProtocol):
+    def __init__(self, client: Redis):
+        self._redis = client
+        self._lock = self._redis.lock('/test', timeout=21, blocking_timeout=4)
+
+    @property
+    def pipelines_redis_key(self) -> str:
+        return '/nostromo/pipelines/'
+
+    def _get_redis_key_by_name(self, name: str) -> str:
+        return f'{self.pipelines_redis_key}{name}'
+
+    async def get_pipelines(self) -> List[Pipeline]:
+        data = await self._redis.keys(self.pipelines_redis_key + '*')
+        return data

{nostromo-0.dev0 → nostromo-0.dev1}/nostromo/services/rich_ui_log.py

@@ -3,7 +3,7 @@ from datetime import datetime, UTC
 from textual.notifications import SeverityLevel
 from textual.widgets import RichLog
 
-from nostromo.protocols.ui_log import UILogProtocol
+from ..protocols.ui_log import UILogProtocol
 
 
 class RichUILogService(UILogProtocol):

nostromo-0.dev1/nostromo/tabs/pipeline_editor.py

@@ -0,0 +1,244 @@
+from asyncio import sleep
+
+import inject
+from textual import work
+from textual.app import ComposeResult
+from textual.containers import Container
+from textual.validation import Regex, Length
+from textual.widget import Widget
+from textual.widgets import Input, Button, Switch
+from textual.widgets import Tree
+from textual.widgets._tree import TreeNode, TreeDataType
+
+from ..protocols.pipelines import PipelinesProtocol
+from ..tcss import Class
+from ..widgets.default_option_list import DefaultOptionList
+from ..widgets.horizontal_form import HorizontalForm
+
+
+class _EntrypointOptions(DefaultOptionList):
+    DEFAULT_CSS = """
+    _EntrypointOptions {layer: above}
+    """
+    _pipelines = inject.attr(PipelinesProtocol)
+
+    def _reset_scripts_options(self):
+        script_options: DefaultOptionList = self.parent.parent.query_one('#ScriptOptions')
+        script_options.clear_options()
+        options = self._pipelines.get_scripts_by_entrypoint(self.value)
+        script_options.reset_options(options)
+
+    def action_select(self) -> None:
+        super().action_select()
+        self._reset_scripts_options()
+
+
+class _CreateButton(Button):
+    DEFAULT_CSS = """
+    _CreateButton {border: round #00AF64 !important; opacity: 0.3 !important;}
+    _CreateButton:focus { background: #1e1e1e !important; color: #00AF64 !important; }
+    _CreateButton.-success {color: #00AF64 !important;}
+    _CreateButton.-active {
+        background: #00AF64 20% !important;
+        border: round #00AF64 !important;
+    }
+    """
+
+    def __init__(self, pipeline_editor_form: '_PipelineEditorForm'):
+        self._pipeline_editor_form = pipeline_editor_form
+        super().__init__('Create', 'success', name=None, id=None, classes=Class.BG, disabled=True, tooltip=None,
+                         action=None)
+
+    def on_button_pressed(self, event: Button.Pressed) -> None:
+        if str(event.button.label) == 'Create':
+            self._pipeline_editor_form.create_tree_item()
+            return
+
+        self._pipeline_editor_form.update_tree_item()
+
+
+class _PipelineEditorForm(HorizontalForm):
+    def __init__(self, content: 'PipelineEditorContent'):
+        self.content = content
+        self.group = Switch(value=True, animate=False, name='Is group', id='type', disabled=True)
+        self.name_input = Input(
+            name='Name',
+            placeholder='example: s3.files_upload',
+            validators=[
+                Regex('^[a-z0-9_.]*$',
+                      failure_description='Group does not match regular expression ^\[a-z0-9_.]*$'),
+                Length(3, 25),
+            ],
+            id='name',
+        )
+
+        self.group_type = DefaultOptionList(*['parallel', 'while', 'foreach'], id='group_type', name='Type')
+        self.create_btn = _CreateButton(self)
+
+        super().__init__(*[
+            self.group,
+            self.name_input,
+            self.group_type,
+            self.create_btn,
+        ], name=None, id=None, classes=None, disabled=False)
+
+    def set_node_name(self, name: str):
+        self.name_input.value = name
+
+    def _on_valid_form(self):
+        self.create_btn.disabled = False
+        self.create_btn.styles.opacity = 100
+
+    def create_tree_item(self):
+        if self.group.value:
+            self.content.create_group(self._form_values['name'])
+        else:
+            self.content.create_task(self._form_values['name'])
+
+        self.clear_inputs()
+        self.name_input.focus()
+        self.group.value = False
+
+    def update_tree_item(self):
+        self.content.tree.update_tree_item(self.name_input.value)
+        self.content.tree.focus()
+
+    def set_create_mode(self):
+        self.name_input.value = ''
+        self.create_btn.label = 'Create'
+        self.group.disabled = False
+        self.group.value = False
+        self.group.styles.opacity = 100
+        self.styles.opacity = 100
+        self.name_input.focus()
+
+    def set_update_mode(self, node: TreeNode):
+        self.name_input.value = node.label.plain
+        self.create_btn.label = 'Update'
+
+        if node.allow_expand and node.expand:
+            self.group.value = True
+        else:
+            self.group.value = False
+
+        self.group.disabled = True
+        self.group.styles.opacity = 0.4
+
+
+class _PipelineTree(Tree):
+    BINDINGS = [
+        ('ctrl+a', 'append_node()', 'Append'),
+        ('ctrl+d', 'delete_node()', 'Delete'),
+    ]
+    DEFAULT_CSS = """
+    _PipelineTree {
+        color: #c7c9ca !important;
+        padding: 1 0 0 2;
+        border-left: #1047A9 60% !important;
+        border-top: #1047A9 60% !important;
+        opacity: 0.8;
+    }
+    _PipelineTree .tree--highlight-line {background: #1e1e1e !important; color: orange !important;}
+    _PipelineTree .tree--cursor {background: #1e1e1e !important; color: orange !important;}
+    _PipelineTree .tree--guides {color: #1047A9}
+    """
+
+    def __init__(
+        self,
+        content: 'PipelineEditorContent',
+        data: TreeDataType | None = None,
+        *,
+        label: str | None = None
+     ) -> None:
+        super().__init__(label=label, data=data, name='', id=None, classes=Class.BG, disabled=False)
+        self.content = content
+
+    def update_tree_item(self, name: str):
+        self.cursor_node.label = name
+
+    def on_focus(self):
+        self.styles.opacity = 100
+        self.content.form.styles.opacity = 0.6
+        self.content.form.set_update_mode(self.cursor_node)
+
+    def on_blur(self) -> None:
+        self.styles.opacity = 0.7
+        self.content.form.styles.opacity = 100
+
+    def action_cursor_up(self) -> None:
+        super().action_cursor_up()
+        self.content.form.set_update_mode(self.cursor_node)
+
+    def action_cursor_down(self) -> None:
+        super().action_cursor_down()
+        self.content.form.set_update_mode(self.cursor_node)
+
+    def action_append_node(self):
+        if self.cursor_node.allow_expand and self.cursor_node.expand:
+            self.styles.opacity = 0.7
+            self.content.form.set_create_mode()
+            return
+
+        self.notify(f'Active element - task "{self.cursor_node.label}". You can only add elements to groups',
+                    title='Task error',
+                    severity='error')
+
+    def action_delete_node(self):
+        self.cursor_node.remove()
+
+
+class PipelineEditorContent(Widget):
+    tree: _PipelineTree or None = None
+    DEFAULT_CSS = """
+    _PipelineEditorForm {width: 0.4fr !important; margin: 0 0 0 5}
+    Tree {display: none}
+    """
+
+    @classmethod
+    def get_id(cls):
+        return 'PipelineEditor'
+
+    def compose(self) -> ComposeResult:
+        yield Container(
+            _PipelineEditorForm(self),
+            Container(id='tree'),
+            classes='hl',
+        )
+
+    @property
+    def create_btn(self) -> _CreateButton:
+        return self.query_one(_CreateButton)
+
+    def deactivate_create_btn(self):
+        btn = self.create_btn
+        btn.disabled = True
+        btn.styles.opacity = 0.3
+
+    @property
+    def form(self) -> _PipelineEditorForm:
+        return self.query_one(_PipelineEditorForm)
+
+    def create_task(self, name: str):
+        self.tree.cursor_node.add_leaf(name)
+        self.deactivate_create_btn()
+
+    def create_group(self, name: str):
+        if self.tree:
+            self.tree.cursor_node.add(name, expand=True)
+        else:
+            self.tree = _PipelineTree(content=self, label=name)
+            self.load_tree(self.tree)
+
+        self.deactivate_create_btn()
+
+    @work(exclusive=True)
+    async def load_tree(self, tree: Tree):
+        container = self.query_one('#tree')
+        container.set_loading(True)
+        await sleep(0.4)
+        await container.mount(tree)
+
+        tree.root.expand()
+        container.set_loading(False)
+        tree.styles.display = 'block'
+        self.query_one(Switch).disabled = False

{nostromo-0.dev0 → nostromo-0.dev1}/nostromo/tabs/pipelines.py

@@ -2,13 +2,13 @@ from asyncio import sleep
 
 import inject
 from rich.text import Text
-from textual import work, events
+from textual import work
 from textual.app import ComposeResult
 from textual.widget import Widget
 from textual.widgets import DataTable
 
-from nostromo.protocols.pipelines import PipelinesProtocol
-from nostromo.protocols.ui_log import UILogProtocol
+from ..protocols.pipelines import PipelinesProtocol
+from ..protocols.ui_log import UILogProtocol
 
 
 class _PipelinesTable(DataTable):
@@ -53,23 +53,6 @@ class _PipelinesTable(DataTable):
         await self._pipelines.kill_pipeline(last_run)
         self._log.warning(pipeline_name, 'Pipeline killed')
 
-    @property
-    def default_opacity(self) -> float:
-        return 0.7
-
-    def on_mount(self):
-        self.styles.opacity = self.default_opacity
-        if not self.rows:
-            return
-
-        self.track_pipelines()
-
-    def _on_focus(self, event: events.Focus) -> None:
-        self.styles.opacity = 1
-
-    def _on_blur(self, event: events.Blur) -> None:
-        self.styles.opacity = self.default_opacity
-
     @work(exclusive=True)
     async def track_pipelines(self):
         while True:

nostromo-0.dev1/nostromo/tcss.py

@@ -0,0 +1,2 @@
+class Class:
+    BG = 'bg'

{nostromo-0.dev0 → nostromo-0.dev1}/nostromo/widgets/default_option_list.py

@@ -11,10 +11,12 @@ from textual.widgets import OptionList
 
 class DefaultOptionList(OptionList):
     DEFAULT_CSS = """
-    DefaultOptionList {
-        layer: above;
-    }
+    .option-list--option {layer: above}
+    DefaultOptionList {width: 52 !important}
+    DefaultOptionList:focus {border: ascii #4577D4 60% !important}
+    DefaultOptionList:focus > .option-list--option-highlighted {background: #4577D4 60%}
     """
+
     _options_copy = []
     _input_buffer = reactive('')
     _last_input_dt = datetime.now(UTC)

nostromo-0.dev1/nostromo/widgets/horizontal_form.py

@@ -0,0 +1,73 @@
+from textual import on
+from textual.app import ComposeResult
+from textual.containers import Container
+from textual.widget import Widget
+from textual.widgets import Label, Input, Button
+
+
+class HorizontalForm(Widget):
+    DEFAULT_CSS = """
+    .error {color: #FF6440 !important}
+    .hl Label {padding: 1 0 0 0}
+
+    .-invalid {border: solid #FF6440 60% !important; color: #FF6440 !important}
+    .-invalid:focus {border: solid #FF6440 60% !important; color: #FF6440 !important}
+    
+    Input {border: solid #4577D4 0% !important; margin-left: 1 !important; max-width: 50 !important}
+    Input:focus {border: solid #4577D4 60% !important; color: #4577D4}
+    """
+
+    def __init__(self, *form_items: Widget, name: str | None = None, id: str | None = None, classes: str | None = None,
+                 disabled: bool = False) -> None:
+        super().__init__(*[], name=name, id=id, classes=classes, disabled=disabled)
+        self._form_items = form_items
+        self._errors_by_name = {}
+        self._form_values = {}
+
+    def compose(self) -> ComposeResult:
+        max_label_width = max([len(w.name) for w in self._form_items if not isinstance(w, Button)]) + 1
+
+        fields = []
+        for field in self._form_items:
+            if isinstance(field, Button):
+                field.styles.margin = [0, 0, 0, 15]
+                fields.append(field)
+                continue
+
+            label = Label(field.name)
+            label.styles.width = max_label_width
+            fields.append(Container(
+                label,
+                field,
+                classes='hl',
+            ))
+
+            error_label = Label(id=f'{field.id}-error')
+            error_label.styles.margin = [0, 0, 0, max_label_width + 1]
+            fields.append(error_label)
+
+        yield Container(*fields, classes='vl')
+
+    def clear_inputs(self):
+        for field in self._form_items:
+            if isinstance(field, Input):
+                field.value = ''
+
+    @on(Input.Changed)
+    def show_invalid_reasons(self, event: Input.Changed) -> None:
+        input_id = event.input.id
+        self._form_values[input_id] = event.input.value
+        self._errors_by_name.setdefault(input_id, [])
+        self._errors_by_name[input_id] = event.validation_result.failure_descriptions
+
+        for field, errors in self._errors_by_name.items():
+            error = self.query_one(f'#{field}-error')
+            error.remove_children()
+            for msg in errors:
+                error.mount(Label(msg, classes='error'))
+
+        if not all(self._errors_by_name.values()):
+            self._on_valid_form()
+
+    def _on_valid_form(self):
+        pass

{nostromo-0.dev0 → nostromo-0.dev1}/nostromo/widgets/pipeline_builder.py

@@ -4,11 +4,11 @@ from textual.validation import Regex
 from textual.widget import Widget
 from textual.widgets import Input, Button, Footer, Pretty
 
-from nostromo.protocols.path import PathProtocol
-from nostromo.protocols.pipelines import PipelinesProtocol
-from nostromo.protocols.ui_log import UILogProtocol
-from nostromo.widgets.default_option_list import DefaultOptionList
-from nostromo.widgets.horizontal_form import HorizontalForm
+from .protocols.path import PathProtocol
+from .protocols.pipelines import PipelinesProtocol
+from .protocols.ui_log import UILogProtocol
+from .widgets.default_option_list import DefaultOptionList
+from .widgets.horizontal_form import HorizontalForm
 
 
 class _EntrypointOptions(DefaultOptionList):

{nostromo-0.dev0 → nostromo-0.dev1}/pyproject.toml

@@ -3,9 +3,14 @@ requires = ["poetry-core==1.9.1"]
 build-backend = "poetry.core.masonry.api"
 
 
+[tool.poetry.scripts]
+nostromo = 'nostromo.run:app'
+
+
 [tool.poetry]
+package-mode = true
 name = "nostromo"
-version = "0.dev.0"
+version = "0.dev.1"
 description = "pipeline builder, runner, process manager, background jobs, job scheduling"
 authors = ["Danila Ganchar"]
 license = "MIT"
@@ -22,4 +27,7 @@ pypyr = "5.9.1"
 bigtree = "^0.22.3"
 psutil = "^6.1.0"
 redis = "5.0.1"
-saq = {extras = ["redis"], version = "^0.18.3"}
+saq = {extras = ["hiredis", "web"], version = "^0.18.3"}
+func-timeout = "^4.3.5"
+typer = "^0.13.1"
+starlette = "^0.41.3"

nostromo-0.dev0/nostromo/screens/pipeline_builder.py

@@ -1,11 +0,0 @@
-from textual.app import ComposeResult
-from textual.screen import Screen
-
-from nostromo.widgets.pipeline_builder import PipelineBuilderWidget
-
-
-class PipelineBuilderScreen(Screen):
-    BINDINGS = [('ctrl+n', 'app.pop_screen', 'Close Pipeline Builder')]
-
-    def compose(self) -> ComposeResult:
-        yield PipelineBuilderWidget()

nostromo-0.dev0/nostromo/tabs/scheduler.py

@@ -1,12 +0,0 @@
-from textual.app import ComposeResult
-from textual.widget import Widget
-from textual.widgets import Label
-
-
-class SchedulerContent(Widget):
-    @classmethod
-    def get_id(cls):
-        return 'Scheduler'
-
-    def compose(self) -> ComposeResult:
-        yield Label('Scheduler')

nostromo-0.dev0/nostromo/widgets/horizontal_form.py

@@ -1,35 +0,0 @@
-from textual.app import ComposeResult
-from textual.containers import Horizontal, Vertical
-from textual.widget import Widget
-from textual.widgets import Label, OptionList
-
-
-class HorizontalForm(Horizontal):
-    DEFAULT_CSS = """
-    HorizontalForm Label {
-        padding: 1;
-        text-align: right;
-    }
-    
-    DefaultOptionList {
-        min-height: 3;
-    }
-    """
-
-    def __init__(self, *form_items: Widget, name: str | None = None, id: str | None = None, classes: str | None = None,
-                 disabled: bool = False) -> None:
-        super().__init__(*[], name=name, id=id, classes=classes, disabled=disabled)
-        self._form_items = form_items
-
-    def compose(self) -> ComposeResult:
-        labels = Vertical(*[Label(w.name) for w in self._form_items])
-        labels.styles.max_width = max(*[len(w.name) for w in self._form_items])
-        yield labels
-
-        items = []
-        for item in self._form_items:
-            if isinstance(item, OptionList):
-                items.append(Label(item.name))
-            items.append(item)
-
-        yield Vertical(*items)