omxtra 0.0.0.dev545__tar.gz → 0.0.0.dev547__tar.gz

{omxtra-0.0.0.dev545/omxtra.egg-info → omxtra-0.0.0.dev547}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omxtra
-Version: 0.0.0.dev545
+Version: 0.0.0.dev547
 Summary: omxtra
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,18 +14,26 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev545
+Requires-Dist: omlish==0.0.0.dev547
 Provides-Extra: all
+Requires-Dist: omdev==0.0.0.dev547; extra == "all"
 Requires-Dist: h11~=0.16; extra == "all"
 Requires-Dist: h2~=4.3; extra == "all"
 Requires-Dist: priority~=2.0; extra == "all"
 Requires-Dist: wsproto~=1.3; extra == "all"
+Requires-Dist: paramiko~=4.0; extra == "all"
+Requires-Dist: asyncssh~=2.22; extra == "all"
 Requires-Dist: jinja2~=3.1; extra == "all"
+Provides-Extra: omdev
+Requires-Dist: omdev==0.0.0.dev547; extra == "omdev"
 Provides-Extra: server
 Requires-Dist: h11~=0.16; extra == "server"
 Requires-Dist: h2~=4.3; extra == "server"
 Requires-Dist: priority~=2.0; extra == "server"
 Requires-Dist: wsproto~=1.3; extra == "server"
+Provides-Extra: ssh
+Requires-Dist: paramiko~=4.0; extra == "ssh"
+Requires-Dist: asyncssh~=2.22; extra == "ssh"
 Provides-Extra: templates
 Requires-Dist: jinja2~=3.1; extra == "templates"
 Dynamic: license-file

{omxtra-0.0.0.dev545 → omxtra-0.0.0.dev547}/omxtra/__about__.py

@@ -15,6 +15,10 @@ class Project(ProjectBase):
     ]
 
     optional_dependencies: dict = {
+        'omdev': [
+            f'omdev == {__version__}',
+        ],
+
         'server': [
             'h11 ~= 0.16',
             'h2 ~= 4.3',
@@ -22,6 +26,12 @@ class Project(ProjectBase):
             'wsproto ~= 1.3',
         ],
 
+        'ssh': [
+            'paramiko ~= 4.0',  # !! LGPL
+
+            'asyncssh ~= 2.22',  # cffi
+        ],
+
         'templates': [
             'jinja2 ~= 3.1',
         ],

omxtra-0.0.0.dev547/omxtra/commands/runners.py

@@ -0,0 +1,88 @@
+"""
+TODO:
+ - timeout
+ - stream in/out/err
+ - *sessions*
+ - anyio
+"""
+import abc
+import asyncio
+import io
+import typing as ta
+
+from omlish import check
+from omlish import dataclasses as dc
+from omlish import lang
+
+
+##
+
+
+class CommandRunner(lang.Abstract):
+    @dc.dataclass(frozen=True)
+    class Command:
+        args: ta.Sequence[str]
+        in_: bytes | None = None
+
+    @dc.dataclass(frozen=True)
+    class Result:
+        rc: int
+        out: bytes
+        err: bytes
+
+        def check(self) -> ta.Self:
+            if self.rc != 0:
+                raise CommandRunner.ReturnCodeError(self)
+            return self
+
+    class ReturnCodeError(Exception):
+        def __init__(self, result: 'CommandRunner.Result') -> None:
+            super().__init__(f'Bad return code: {result.rc}', result)
+
+            self.result = result
+
+    @abc.abstractmethod
+    async def run_command(self, cmd: Command) -> Result:
+        raise NotImplementedError
+
+
+class LocalCommandRunner(CommandRunner):
+    @dc.dataclass(frozen=True)
+    class Config:
+        cwd: str | None = None
+
+    def __init__(self, cfg: Config = Config()) -> None:
+        super().__init__()
+
+        self._cfg = check.isinstance(cfg, LocalCommandRunner.Config)
+
+    async def run_command(self, cmd: CommandRunner.Command) -> CommandRunner.Result:
+        proc = await asyncio.create_subprocess_exec(
+            *cmd.args,
+            stdin=io.BytesIO(cmd.in_) if cmd.in_ is not None else None,
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE,
+            **(dict(cwd=self._cfg.cwd) if self._cfg.cwd is not None else {}),  # type: ignore
+        )
+
+        out, err = await proc.communicate()
+
+        return CommandRunner.Result(
+            rc=check.not_none(proc.returncode),
+            out=out,
+            err=err,
+        )
+
+
+async def _a_main() -> None:
+    cmd = CommandRunner.Command(
+        ['ls', '-al'],
+    )
+
+    rc = await LocalCommandRunner().run_command(cmd)
+    check.equal(rc.rc, 0)
+    print(rc.out.decode())
+
+
+if __name__ == '__main__':
+    asyncio.run(_a_main())

omxtra-0.0.0.dev547/omxtra/commands/ssh.py

@@ -0,0 +1,194 @@
+"""
+TODO:
+ - sessionized
+ - streamed
+ - actual timeout
+
+bcrypt
+fido2
+gssapi
+libnacl
+pkcs11
+pyOpenSSL
+
+asyncssh[bcrypt,fido2,gssapi,libnacl,pkcs11,pyOpenSSL]
+"""
+import asyncio
+import contextlib
+import shlex
+import typing as ta
+
+from omdev.home.secrets import load_secrets
+from omlish import check
+from omlish import dataclasses as dc
+from omlish import lang
+
+from .runners import CommandRunner
+from .runners import LocalCommandRunner
+
+
+if ta.TYPE_CHECKING:
+    import asyncssh
+    import paramiko
+else:
+    asyncssh = lang.proxy_import('asyncssh')
+    paramiko = lang.proxy_import('paramiko')
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class SshConfig:
+    host: str | None = None
+    port: int | None = None
+
+    username: str | None = None
+    password: str | None = None
+
+    key_file_path: str | None = None
+
+
+class SshSubprocessCommandRunner(CommandRunner):
+    def __init__(
+            self,
+            cfg: SshConfig,
+            lcr: LocalCommandRunner | None = None,
+    ) -> None:
+        super().__init__()
+
+        self._cfg = check.isinstance(cfg, SshConfig)
+        self._lcr = check.isinstance(lcr, LocalCommandRunner) if lcr is not None else LocalCommandRunner()
+
+    async def run_command(self, cmd: CommandRunner.Command) -> CommandRunner.Result:
+        args = ['ssh']
+
+        if self._cfg.key_file_path is not None:
+            args.extend(['-i', self._cfg.key_file_path])
+
+        if self._cfg.port is not None:
+            args.extend(['-p', str(self._cfg.port)])
+
+        dst = check.non_empty_str(self._cfg.host)
+        if self._cfg.username is not None:
+            dst = f'{self._cfg.username}@{dst}'
+        if self._cfg.password is not None:
+            raise NotImplementedError
+
+        args.append(dst)
+        args.extend(cmd.args)
+        lcmd = CommandRunner.Command(
+            args=args,
+            in_=cmd.in_,
+        )
+        return await self._lcr.run_command(lcmd)
+
+
+class AsyncsshSshCommandRunner(CommandRunner):
+    def __init__(
+            self,
+            cfg: SshConfig,
+    ) -> None:
+        super().__init__()
+
+        self._cfg = check.isinstance(cfg, SshConfig)
+
+    async def run_command(self, cmd: CommandRunner.Command) -> CommandRunner.Result:
+        arg = ' '.join(map(shlex.quote, cmd.args))
+
+        async with asyncssh.connect(
+                self._cfg.host,
+                encoding=None,
+                **(dict(port=int(self._cfg.port)) if self._cfg.port is not None else {}),
+                **(dict(username=self._cfg.username) if self._cfg.username is not None else {}),
+                **(dict(password=self._cfg.password) if self._cfg.password is not None else {}),
+                **(dict(client_keys=[self._cfg.key_file_path]) if self._cfg.key_file_path is not None else {}),
+                known_hosts=None,
+        ) as conn:
+            proc: asyncssh.SSHClientProcess
+            async with await conn.create_process(arg) as proc:
+                checkw = False
+                timeout = None
+                res = await proc.wait(checkw, timeout)
+
+        return CommandRunner.Result(
+            rc=check.not_none(res.returncode),
+            out=check.isinstance(res.stdout, bytes),
+            err=check.isinstance(res.stderr, bytes),
+        )
+
+
+class ParamikoSshCommandRunner(CommandRunner):
+    def __init__(
+            self,
+            cfg: SshConfig,
+    ) -> None:
+        super().__init__()
+
+        self._cfg = check.isinstance(cfg, SshConfig)
+
+    def _run_command(self, cmd: CommandRunner.Command) -> CommandRunner.Result:
+        arg = ' '.join(map(shlex.quote, cmd.args))
+
+        kw: dict[str, ta.Any] = {}
+        if self._cfg.port is not None:
+            kw.update(port=int(self._cfg.port))
+        if self._cfg.username is not None:
+            kw.update(username=self._cfg.username)
+        if self._cfg.password is not None:
+            kw.update(password=self._cfg.password)
+        if self._cfg.key_file_path is not None:
+            kw.update(key_filename=self._cfg.key_file_path)
+
+        client: paramiko.client.SSHClient
+        with contextlib.closing(paramiko.client.SSHClient()) as client:
+            client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+
+            client.connect(
+                check.not_none(self._cfg.host),
+                **kw,
+            )
+
+            si, so, se = client.exec_command(arg)
+            # https://stackoverflow.com/questions/60037299/attributeerror-nonetype-object-has-no-attribute-time-paramiko
+            si.close()
+
+            rc = so.channel.recv_exit_status()
+            out = so.read()
+            err = se.read()
+
+        return CommandRunner.Result(
+            rc=rc,
+            out=out,
+            err=err,
+        )
+
+    async def run_command(self, cmd: CommandRunner.Command) -> CommandRunner.Result:
+        return await asyncio.to_thread(self._run_command, cmd)
+
+
+async def _a_main() -> None:
+    cmd = CommandRunner.Command(
+        ['ls', '-al'],
+    )
+
+    cfg = load_secrets()
+
+    sc = SshConfig(
+        host=cfg.get('ec2_ssh_host').reveal(),
+        username=cfg.get('ec2_ssh_user').reveal(),
+        key_file_path=cfg.get('ec2_ssh_key_file').reveal(),
+    )
+
+    for scr in [
+        SshSubprocessCommandRunner(sc),
+        AsyncsshSshCommandRunner(sc),
+        ParamikoSshCommandRunner(sc),
+    ]:
+        rc = await scr.run_command(cmd)
+        check.equal(rc.rc, 0)
+        print(rc.out.decode())
+
+
+if __name__ == '__main__':
+    asyncio.run(_a_main())

omxtra-0.0.0.dev547/omxtra/specs/proto/abnf.py

@@ -0,0 +1,23 @@
+import os.path
+
+from omlish import check
+from omlish.text import abnf
+
+
+def _main() -> None:
+    with open(os.path.join(os.path.dirname(__file__), 'proto3.abnf')) as f:
+        gram_src = f.read()
+
+    gram = abnf.parse_grammar(gram_src, root='proto-file')
+
+    with open(os.path.join(os.path.dirname(__file__), 'tests', 'examples', 'addressbook.proto')) as f:
+        addressbook_src = f.read()
+
+    addressbook = check.not_none(gram.parse(addressbook_src))
+    addressbook = abnf.only_match_rules(addressbook)
+
+    print(addressbook.render(indent=2))
+
+
+if __name__ == '__main__':
+    _main()

omxtra-0.0.0.dev547/omxtra/specs/proto/proto3.abnf

@@ -0,0 +1,280 @@
+; Proto3 source grammar in ABNF
+; RFC 5234 core rules plus RFC 7405 case-sensitive strings (%s"...").
+; This version uses:
+;   SKIP = whitespace-or-comment token
+;   S    = zero or more SKIP
+;   R    = one or more SKIP
+;
+; It is still a character-level grammar, not a true lexer/parser split.
+
+; ------------------------------------------------------------------------------
+; File
+; ------------------------------------------------------------------------------
+
+proto-file         = S syntax-stmt S *(file-item S)
+
+file-item          = import-stmt
+                   / package-stmt
+                   / option-stmt
+                   / top-level-def
+                   / empty-stmt
+
+top-level-def      = message-def / enum-def / service-def
+
+; ------------------------------------------------------------------------------
+; Whitespace / comments
+; ------------------------------------------------------------------------------
+
+SKIP               = WS / comment
+S                  = *SKIP
+R                  = 1*SKIP
+
+WS                 = SP / HTAB / CR / LF
+
+comment            = line-comment / block-comment
+line-comment       = "//" *not-eol
+not-eol            = %x00-09 / %x0B-0C / %x0E-FF
+
+; Non-nested C-style block comment.
+block-comment      = "/*" *block-comment-item "*/"
+block-comment-item = block-comment-safe / ("*" block-comment-not-slash)
+block-comment-safe = %x00-29 / %x2B-FF
+block-comment-not-slash
+                   = %x00-2E / %x30-FF
+
+; ------------------------------------------------------------------------------
+; Lexical items
+; ------------------------------------------------------------------------------
+
+squote             = %x27
+OCTDIG             = %x30-37
+NZDIGIT            = %x31-39
+
+ident              = ALPHA *(ALPHA / DIGIT / "_")
+full-ident         = ident *("." ident)
+
+message-name       = ident
+enum-name          = ident
+field-name         = ident
+oneof-name         = ident
+map-name           = ident
+service-name       = ident
+rpc-name           = ident
+
+message-type       = ["." ] full-ident
+enum-type          = ["." ] full-ident
+
+int-lit            = decimal-lit / octal-lit / hex-lit
+decimal-lit        = ["-"] NZDIGIT *DIGIT
+octal-lit          = ["-"] "0" *OCTDIG
+hex-lit            = ["-"] "0" (%s"x" / %s"X") 1*HEXDIG
+
+float-lit          = ( ["-"] float-number ) / %s"inf" / %s"nan"
+float-number       = ( digits "." [digits] [exponent] )
+                   / ( digits exponent )
+                   / ( "." digits [exponent] )
+digits             = 1*DIGIT
+exponent           = (%s"e" / %s"E") ["+" / "-"] digits
+
+bool-lit           = %s"true" / %s"false"
+
+str-lit            = str-lit-single *(S str-lit-single)
+str-lit-single     = squote *sq-char squote / DQUOTE *dq-char DQUOTE
+
+sq-char            = hex-escape / oct-escape / char-escape / unicode-escape
+                   / unicode-long-escape / sq-unescaped
+dq-char            = hex-escape / oct-escape / char-escape / unicode-escape
+                   / unicode-long-escape / dq-unescaped
+
+sq-unescaped       = %x01-09 / %x0B-0C / %x0D / %x0E-26 / %x28-5B / %x5D-FF
+dq-unescaped       = %x01-09 / %x0B-0C / %x0D / %x0E-21 / %x23-5B / %x5D-FF
+
+hex-escape         = %x5C (%s"x" / %s"X") HEXDIG [HEXDIG]
+oct-escape         = %x5C OCTDIG [OCTDIG [OCTDIG]]
+char-escape        = %x5C (%s"a" / %s"b" / %s"f" / %s"n" / %s"r" / %s"t" / %s"v"
+                   / %x5C / squote / DQUOTE)
+unicode-escape     = %x5C %s"u" 4HEXDIG
+unicode-long-escape
+                   = %x5C %s"U" ( %s"000" 5HEXDIG / %s"0010" 4HEXDIG )
+
+empty-stmt         = ";"
+
+constant           = full-ident
+                   / (["+" / "-"] S int-lit)
+                   / (["+" / "-"] S float-lit)
+                   / str-lit
+                   / bool-lit
+                   / message-value
+
+; ------------------------------------------------------------------------------
+; File-level declarations
+; ------------------------------------------------------------------------------
+
+syntax-stmt        = %s"syntax" S "=" S (squote %s"proto3" squote / DQUOTE %s"proto3" DQUOTE) S ";"
+
+import-stmt        = %s"import" R [(%s"weak" / %s"public") R] str-lit S ";"
+
+package-stmt       = %s"package" R full-ident S ";"
+
+option-stmt        = %s"option" R option-name S "=" S constant S ";"
+
+option-name        = option-name-part *("." option-name-part)
+option-name-part   = ident / braced-full-ident
+braced-full-ident  = "(" S ["." ] full-ident S ")"
+
+; ------------------------------------------------------------------------------
+; Types / fields
+; ------------------------------------------------------------------------------
+
+type               = scalar-type / message-type / enum-type
+
+scalar-type        = %s"double" / %s"float"
+                   / %s"int32" / %s"int64"
+                   / %s"uint32" / %s"uint64"
+                   / %s"sint32" / %s"sint64"
+                   / %s"fixed32" / %s"fixed64"
+                   / %s"sfixed32" / %s"sfixed64"
+                   / %s"bool" / %s"string" / %s"bytes"
+
+field-number       = int-lit
+
+field              = [(%s"repeated" / %s"optional") R]
+                     type R field-name S "=" S field-number
+                     [S "[" S field-options S "]"]
+                     S ";"
+
+field-options      = field-option *(S "," S field-option)
+field-option       = option-name S "=" S constant
+
+oneof-def          = %s"oneof" R oneof-name S "{"
+                     S *(option-stmt S / oneof-field S)
+                     "}"
+
+oneof-field        = type R field-name S "=" S field-number
+                     [S "[" S field-options S "]"]
+                     S ";"
+
+map-field          = %s"map" S "<" S key-type S "," S type S ">"
+                     R map-name S "=" S field-number
+                     [S "[" S field-options S "]"]
+                     S ";"
+
+key-type           = %s"int32" / %s"int64"
+                   / %s"uint32" / %s"uint64"
+                   / %s"sint32" / %s"sint64"
+                   / %s"fixed32" / %s"fixed64"
+                   / %s"sfixed32" / %s"sfixed64"
+                   / %s"bool" / %s"string"
+
+reserved-stmt      = %s"reserved" R (ranges / str-field-names) S ";"
+ranges             = range *(S "," S range)
+range              = int-lit [R %s"to" R (int-lit / %s"max")]
+
+str-field-names    = str-field-name *(S "," S str-field-name)
+str-field-name     = squote field-name squote / DQUOTE field-name DQUOTE
+
+; ------------------------------------------------------------------------------
+; Enum definitions
+; ------------------------------------------------------------------------------
+
+enum-def           = %s"enum" R enum-name S enum-body
+
+enum-body          = "{"
+                     S *(option-stmt S / enum-field S / empty-stmt S / reserved-stmt S)
+                     "}"
+
+enum-field         = ident S "=" S ["-" S] int-lit
+                     [S "[" S enum-value-options S "]"]
+                     S ";"
+
+enum-value-options = enum-value-option *(S "," S enum-value-option)
+enum-value-option  = option-name S "=" S constant
+
+; ------------------------------------------------------------------------------
+; Message definitions
+; ------------------------------------------------------------------------------
+
+message-def        = %s"message" R message-name S message-body
+
+message-body       = "{"
+                     S *(field S
+                       / enum-def S
+                       / message-def S
+                       / option-stmt S
+                       / oneof-def S
+                       / map-field S
+                       / reserved-stmt S
+                       / empty-stmt S)
+                     "}"
+
+; ------------------------------------------------------------------------------
+; Service definitions
+; ------------------------------------------------------------------------------
+
+service-def        = %s"service" R service-name S "{"
+                     S *(option-stmt S / rpc S / empty-stmt S)
+                     "}"
+
+rpc                = %s"rpc" R rpc-name
+                     S "(" S [ %s"stream" R ] message-type S ")"
+                     S %s"returns"
+                     S "(" S [ %s"stream" R ] message-type S ")"
+                     S ( "{" S *(option-stmt S / empty-stmt S) "}" / ";" )
+
+; ------------------------------------------------------------------------------
+; MessageValue (from protobuf text format, adapted to use outer S/comment rules)
+; ------------------------------------------------------------------------------
+
+message-value      = "{" S text-message S "}"
+                   / "<" S text-message S ">"
+
+text-message       = *(text-field S)
+
+text-field         = text-scalar-field / text-message-field
+
+text-message-field = text-field-name
+                     [S ":"]
+                     S (message-value / text-message-list)
+                     [S (";" / ",")]
+
+text-scalar-field  = text-field-name
+                     S ":"
+                     S (text-scalar-value / text-scalar-list)
+                     [S (";" / ",")]
+
+text-message-list  = "[" S [message-value *(S "," S message-value)] S "]"
+text-scalar-list   = "[" S [text-scalar-value *(S "," S text-scalar-value)] S "]"
+
+text-scalar-value  = str-lit
+                   / text-float-value
+                   / text-signed-ident
+                   / ident
+                   / text-signed-int
+                   / int-lit
+
+text-signed-ident  = "-" S ident
+text-signed-int    = "-" S int-lit
+
+text-float-value   = text-float-number [("f" / "F")]
+                   / text-decimal-uint ("f" / "F")
+                   / %s"inf"
+                   / %s"nan"
+
+text-float-number  = digits "." [digits] [exponent]
+                   / digits exponent
+                   / "." digits [exponent]
+
+text-decimal-uint  = "0" / (NZDIGIT *DIGIT)
+
+text-field-name    = ident / text-extension-name / text-any-name
+text-extension-name
+                   = "[" S text-type-name S "]"
+text-any-name      = "[" S text-url-prefix "/" text-type-name S "]"
+
+text-type-name     = ident *("." ident)
+
+text-url-prefix    = text-url-char *(text-url-char / "/")
+text-url-char      = ALPHA / DIGIT / "-" / "." / "~" / "_"
+                   / "!" / "$" / "&" / "(" / ")"
+                   / "*" / "+" / "," / ";" / "="
+                   / "%" HEXDIG HEXDIG

omxtra-0.0.0.dev547/omxtra/sql/parsing/abnf.py

@@ -0,0 +1,15 @@
+import os.path
+
+from omlish.text import abnf
+
+
+def _main() -> None:
+    with open(os.path.join(os.path.dirname(__file__), 'minisql.abnf')) as f:
+        gram = abnf.parse_grammar(f.read(), root='single-stmt')
+
+    m = gram.parse('select x from y;')
+    print(m)
+
+
+if __name__ == '__main__':
+    _main()