ominfra 0.0.0.dev96__tar.gz → 0.0.0.dev98__tar.gz

{ominfra-0.0.0.dev96/ominfra.egg-info → ominfra-0.0.0.dev98}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev96
+Version: 0.0.0.dev98
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev96
-Requires-Dist: omlish==0.0.0.dev96
+Requires-Dist: omdev==0.0.0.dev98
+Requires-Dist: omlish==0.0.0.dev98
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev96 → ominfra-0.0.0.dev98}/ominfra/.manifests.json

@@ -15,7 +15,7 @@
     "module": ".tailscale.cli",
     "attr": "_CLI_MODULE",
     "file": "ominfra/tailscale/cli.py",
-    "line": 110,
+    "line": 118,
     "value": {
       "$omdev.cli.types.CliModule": {
         "cmd_name": [

{ominfra-0.0.0.dev96 → ominfra-0.0.0.dev98}/ominfra/tailscale/cli.py

@@ -6,6 +6,7 @@ import typing as ta
 from omdev.cli import CliModule
 from omlish import argparse as ap
 from omlish import cached
+from omlish import check
 from omlish import collections as col
 from omlish import dataclasses as dc
 from omlish import lang
@@ -16,6 +17,9 @@ from omlish.formats import json
 ##
 
 
+_IP_V4_PAT = re.compile(r'\d{1,3}(\.\d{1,3}){3}')
+
+
 @dc.dataclass(frozen=True)
 @msh.update_object_metadata(field_naming=msh.Naming.CAMEL, unknown_field='x')
 class CliNode:
@@ -27,6 +31,10 @@ class CliNode:
     allowed_ips: ta.Sequence[str] | None = dc.xfield(None) | msh.update_field_metadata(name='AllowedPs')
     tags: ta.Sequence[str] | None = None
 
+    @property
+    def ipv4s(self) -> ta.Sequence[str]:
+        return [i for i in self.tailscale_ips or () if _IP_V4_PAT.fullmatch(i)]
+
     x: ta.Mapping[str, ta.Any] | None = None
 
 
@@ -56,9 +64,6 @@ class CliStatus:
 ##
 
 
-_IP_V4_PAT = re.compile(r'\d{1,3}(\.\d{1,3}){3}')
-
-
 class Cli(ap.Cli):
     @lang.cached_function
     def bin(self) -> str:
@@ -92,19 +97,22 @@ class Cli(ap.Cli):
             out = status
         print(json.dumps_pretty(msh.marshal(out)))
 
+    @ap.command()
+    def ips(self) -> None:
+        print(json.dumps_pretty({
+            hn: node.ipv4s
+            for hn, node in self.status().nodes_by_host_name.items()
+        }))
+
     @ap.command(
         ap.arg('name', nargs='?'),
     )
     def ip(self) -> None:
         status = self.status()
-        ip_lists_by_hostname = {
-            hn: [i for i in node.tailscale_ips or () if _IP_V4_PAT.fullmatch(i)]
-            for hn, node in status.nodes_by_host_name.items()
-        }
         if self.args.name:
-            print(ip_lists_by_hostname[self.args.name][0])
+            print(status.nodes_by_host_name[self.args.name].ipv4s[0])
         else:
-            print(json.dumps_pretty(ip_lists_by_hostname))
+            print(check.not_none(status.self).ipv4s[0])
 
 
 # @omlish-manifest

{ominfra-0.0.0.dev96 → ominfra-0.0.0.dev98/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev96
+Version: 0.0.0.dev98
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev96
-Requires-Dist: omlish==0.0.0.dev96
+Requires-Dist: omdev==0.0.0.dev98
+Requires-Dist: omlish==0.0.0.dev98
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev96 → ominfra-0.0.0.dev98}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev96
-omlish==0.0.0.dev96
+omdev==0.0.0.dev98
+omlish==0.0.0.dev98
 
 [all]
 paramiko~=3.5

{ominfra-0.0.0.dev96 → ominfra-0.0.0.dev98}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev96'
+version = '0.0.0.dev98'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev96',
-    'omlish == 0.0.0.dev96',
+    'omdev == 0.0.0.dev98',
+    'omlish == 0.0.0.dev98',
 ]
 
 [project.optional-dependencies]