omlish 0.0.0.dev58__py3-none-any.whl → 0.0.0.dev60__py3-none-any.whl

omlish/.manifests.json

@@ -27,7 +27,7 @@
     "module": ".diag.pycharm",
     "attr": "_CLI_MODULE",
     "file": "omlish/diag/pycharm.py",
-    "line": 138,
+    "line": 141,
     "value": {
       "$omdev.cli.types.CliModule": {
         "cmd_name": "pycharm",

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev58'
-__revision__ = 'aae9a0f7439a053a6e5c2105ff299991d37335ac'
+__version__ = '0.0.0.dev60'
+__revision__ = 'eb96b2408cdf5b153541f194ea5ab7bba1c2524b'
 
 
 #

omlish/diag/pycharm.py

@@ -27,11 +27,11 @@ def is_pycharm_hosted() -> bool:
 ##
 
 
-PYCHARM_HOME = '/Applications/PyCharm.app'
+DARWIN_PYCHARM_HOME = '/Applications/PyCharm.app'
 
 
-def read_pycharm_info_plist() -> ta.Mapping[str, ta.Any] | None:
-    plist_file = os.path.join(PYCHARM_HOME, 'Contents', 'Info.plist')
+def read_darwin_pycharm_info_plist() -> ta.Mapping[str, ta.Any] | None:
+    plist_file = os.path.join(DARWIN_PYCHARM_HOME, 'Contents', 'Info.plist')
     if not os.path.isfile(plist_file):
         return None
 
@@ -43,13 +43,17 @@ def read_pycharm_info_plist() -> ta.Mapping[str, ta.Any] | None:
 
 @lang.cached_function
 def get_pycharm_version() -> str | None:
-    plist = read_pycharm_info_plist()
-    if plist is None:
-        return None
+    if sys.platform == 'darwin':
+        plist = read_darwin_pycharm_info_plist()
+        if plist is None:
+            return None
+
+        ver = check.non_empty_str(plist['CFBundleVersion'])
+        check.state(ver.startswith('PY-'))
+        return ver[3:]
 
-    ver = check.non_empty_str(plist['CFBundleVersion'])
-    check.state(ver.startswith('PY-'))
-    return ver[3:]
+    else:
+        return None
 
 
 ##
@@ -108,10 +112,6 @@ def pycharm_remote_debugger_attach(
         *,
         version: str | None = None,
 ) -> None:
-    # if version is None:
-    #     version = get_pycharm_version()
-    # check.non_empty_str(version)
-
     if host is None:
         if (
                 sys.platform == 'linux' and
@@ -122,6 +122,9 @@ def pycharm_remote_debugger_attach(
         else:
             host = 'localhost'
 
+    if version is None and host in ('localhost', '127.0.0.1'):
+        version = get_pycharm_version()
+
     if ta.TYPE_CHECKING:
         import pydevd_pycharm  # noqa
     else:

omlish/diag/replserver/server.py

@@ -2,6 +2,7 @@
 FIXME:
  - lol shutdown deadlocks
  - whole thing is just gross is this its own thread or what
+ - cli with client helper too
 
 TODO:
  - !!! ANYIO !!!

omlish/libc.py

@@ -1,7 +1,4 @@
-# ruff: noqa: ANN201
-# ruff: noqa: N801
-# ruff: noqa: N802
-
+# ruff: noqa: ANN201, N801, N802
 import ctypes as ct
 import errno
 import platform
@@ -213,7 +210,14 @@ class Mmap:
         return self._base
 
     def __enter__(self) -> 'Mmap':
-        base = mmap(self._desired_base, self._length, self._prot, self._flags, self._fd, self._offset)
+        base = mmap(
+            self._desired_base,
+            self._length,
+            self._prot,
+            self._flags,
+            self._fd,
+            self._offset,
+        )
         if base == MAP_FAILED:
             err, msg = lasterr()
             raise OSError(err, 'mmap failed: ' + msg)

omlish/marshal/__init__.py

@@ -39,11 +39,6 @@ from .forbidden import (  # noqa
     ForbiddenTypeUnmarshalerFactory,
 )
 
-from .naming import (  # noqa
-    Naming,
-    translate_name,
-)
-
 from .global_ import (  # noqa
     GLOBAL_REGISTRY,
 
@@ -57,6 +52,16 @@ from .helpers import (  # noqa
     update_object_metadata,
 )
 
+from .naming import (  # noqa
+    Naming,
+    translate_name,
+)
+
+from .nop import (  # noqa
+    NOP_MARSHALER_UNMARSHALER,
+    NopMarshalerUnmarshaler,
+)
+
 from .objects import (  # noqa
     FieldInfo,
     FieldInfos,

omlish/marshal/nop.py

@@ -0,0 +1,18 @@
+import typing as ta
+
+from .base import MarshalContext
+from .base import Marshaler
+from .base import UnmarshalContext
+from .base import Unmarshaler
+from .values import Value
+
+
+class NopMarshalerUnmarshaler(Marshaler, Unmarshaler):
+    def marshal(self, ctx: MarshalContext, o: ta.Any) -> Value:
+        return o  # noqa
+
+    def unmarshal(self, ctx: UnmarshalContext, v: Value) -> ta.Any:
+        return v
+
+
+NOP_MARSHALER_UNMARSHALER = NopMarshalerUnmarshaler()

omlish/marshal/primitives.py

@@ -1,5 +1,10 @@
+"""
+TODO:
+ - field-configurable coercion
+"""
 import typing as ta
 
+from .. import dataclasses as dc
 from .base import MarshalContext
 from .base import Marshaler
 from .base import TypeMapMarshalerFactory
@@ -25,24 +30,29 @@ PRIMITIVE_TYPES: tuple[type, ...] = (
 ##
 
 
+@dc.dataclass(frozen=True)
 class PrimitiveMarshalerUnmarshaler(Marshaler, Unmarshaler):
+    ty: type
+
     def marshal(self, ctx: MarshalContext, o: ta.Any) -> Value:
-        if isinstance(o, PRIMITIVE_TYPES):
+        if isinstance(o, self.ty):
             return o  # type: ignore
+        if isinstance(o, PRIMITIVE_TYPES):
+            return self.ty(o)
         raise TypeError(o)
 
     def unmarshal(self, ctx: UnmarshalContext, v: Value) -> ta.Any:
-        if isinstance(v, PRIMITIVE_TYPES):
+        if isinstance(v, self.ty):
             return v
+        if isinstance(v, PRIMITIVE_TYPES):
+            return self.ty(v)
         raise TypeError(v)
 
 
-PRIMITIVE_MARSHALER_UNMARSHALER = PrimitiveMarshalerUnmarshaler()
-
 PRIMITIVE_MARSHALER_FACTORY = TypeMapMarshalerFactory({  # noqa
-    t: PRIMITIVE_MARSHALER_UNMARSHALER for t in PRIMITIVE_TYPES
+    t: PrimitiveMarshalerUnmarshaler(t) for t in PRIMITIVE_TYPES
 })
 
 PRIMITIVE_UNMARSHALER_FACTORY = TypeMapUnmarshalerFactory({  # noqa
-    t: PRIMITIVE_MARSHALER_UNMARSHALER for t in PRIMITIVE_TYPES
+    t: PrimitiveMarshalerUnmarshaler(t) for t in PRIMITIVE_TYPES
 })

{omlish-0.0.0.dev58.dist-info → omlish-0.0.0.dev60.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev58
+Version: 0.0.0.dev60
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev58.dist-info → omlish-0.0.0.dev60.dist-info}/RECORD

@@ -1,5 +1,5 @@
-omlish/.manifests.json,sha256=wTGXwNmvtaKsDWtTwwj3Uib5Inaj8ZBn0MB69bE80X4,1419
-omlish/__about__.py,sha256=9Lm5v-nFcGeCoABbD4--4eapTUaI4C0188gIFKvfBzI,3420
+omlish/.manifests.json,sha256=jvyoQ7x8UJ9lpRgkh7eElwJ8qnzyG5aUGameT9Yk8GM,1419
+omlish/__about__.py,sha256=FBKxqP5dW_gNqz7t1xG_3WdV2AUAJW3mxH9f6_99dok,3420
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=Vr70_85EVLJLgEkRtwOr264tMRtqtlN7ncFfXRUk5aM,6914
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
@@ -12,7 +12,7 @@ omlish/fnpairs.py,sha256=Sl8CMFNyDS-1JYAjSWqnT5FmUm9Lj6o7FxSRo7g4jww,10875
 omlish/fnpipes.py,sha256=AJkgz9nvRRm7oqw7ZgYyz21klu276LWi54oYCLg-vOg,2196
 omlish/genmachine.py,sha256=LCMiqvK32dAWtrlB6lKw9tXdQFiXC8rRdk4TMQYIroU,1603
 omlish/iterators.py,sha256=GGLC7RIT86uXMjhIIIqnff_Iu5SI_b9rXYywYGFyzmo,7292
-omlish/libc.py,sha256=u0481imCiTFqP_e-v9g0pD-0WD249j5vYzhtn-fnNkY,15308
+omlish/libc.py,sha256=QSqAauv4o77T_ttyC6I4M-q33VROHjbZtkN-lEWJ6RU,15364
 omlish/matchfns.py,sha256=I1IlQGfEyk_AcFSy6ulVS3utC-uwyZM2YfUXYHc9Bw0,6152
 omlish/multiprocessing.py,sha256=QZT4C7I-uThCAjaEY3xgUYb-5GagUlnE4etN01LDyU4,5186
 omlish/os.py,sha256=vO1sZCzAhVxo46tDFLrD52q2KuMFWQwu5MPJgSsnliI,3107
@@ -154,13 +154,13 @@ omlish/diag/asts.py,sha256=BveUUNUcaAm4Hg55f4ZxGSI313E4L8cCZ5XjHpEkKVI,3325
 omlish/diag/procfs.py,sha256=vBovaMvAUKdl7FbtFq3TNsSmdhs8DaYfhoEsKeWYta8,9704
 omlish/diag/procstats.py,sha256=UkqxREqfd-38xPYZ9T1SIJISz5ARQCEhTtOZrxtm2dE,777
 omlish/diag/ps.py,sha256=1JWxZen3fVG-20R6ZZ8BtO_gpzw_5bhHZiKdoHkgxoU,1004
-omlish/diag/pycharm.py,sha256=HoEYtBuz04RyQhCMRslSEqMwnMlDU49bjOTBwGeivMk,3181
+omlish/diag/pycharm.py,sha256=d5-qwdewcEw-cUL1gbbNLJsdPYJWKu4vUmtXhkdP4-Q,3297
 omlish/diag/pydevd.py,sha256=Fsx9rfCOnwLD6RLBqH0uAdtq75rbNeBAQfiDvIBd3e0,7295
 omlish/diag/threads.py,sha256=1-x02VCDZ407gfbtXm1pWK-ubqhqfePm9PMqkHCVoqk,3642
 omlish/diag/replserver/__init__.py,sha256=uLo6V2aQ29v9z3IMELlPDSlG3_2iOT4-_X8VniF-EgE,235
 omlish/diag/replserver/__main__.py,sha256=LmU41lQ58bm1h4Mx7S8zhE_uEBSC6kPcp9mn5JRpulA,32
 omlish/diag/replserver/console.py,sha256=XzBDVhYlr8FY6ym4OwoaIHuFOHnGK3dTYlMDIOMUUlA,7410
-omlish/diag/replserver/server.py,sha256=5pRjBn-Vz8gtu45756ycdbJe58C_xrB9rElPytr6h5g,5345
+omlish/diag/replserver/server.py,sha256=Hnfp-aFgUtkWGyVXjWJ33HhhBrrtZnJu5FZRV6MTKoI,5375
 omlish/dispatch/__init__.py,sha256=GsiGJ91NKiQptSROtnCSkrZExBkvfDwYvdoTu5dBqF0,117
 omlish/dispatch/_dispatch2.py,sha256=v3tCNyxGpOwY8qTwdp54TlM8mG6OVwtQoUZfYJ_griU,1756
 omlish/dispatch/_dispatch3.py,sha256=Vnu5DfoPWFJLodudBqoZBXGTi2wYk-Az56MXJgdQvwc,2608
@@ -286,7 +286,7 @@ omlish/logs/formatters.py,sha256=q79nMnR2mRIStPyGrydQHpYTXgC5HHptt8lH3W2Wwbs,671
 omlish/logs/handlers.py,sha256=nyuFgmO05By_Xwq7es58ClzS51-F53lJL7gD0x5IqAg,228
 omlish/logs/noisy.py,sha256=Ubc-eTH6ZbGYsLfUUi69JAotwuUwzb-SJBeGo_0dIZI,348
 omlish/logs/utils.py,sha256=MgGovbP0zUrZ3FGD3qYNQWn-l0jy0Y0bStcQvv5BOmQ,391
-omlish/marshal/__init__.py,sha256=Aiux91y66MpEy4NiecWgASK8RB8vGXpc4GZ4HgbdwCg,2049
+omlish/marshal/__init__.py,sha256=G0MDeBStBjz9Njq-rt5C6WbuCik6c8st7cipwMVw668,2139
 omlish/marshal/any.py,sha256=e82OyYK3Emm1P1ClnsnxP7fIWC2iNVyW0H5nK4mLmWM,779
 omlish/marshal/base.py,sha256=I7IOzFGn_DFeBRFCH8F0ONBa-NzM4mmMDld6bmoW-rc,6501
 omlish/marshal/base64.py,sha256=F-3ogJdcFCtWINRgJgWT0rErqgx6f4qahhcg8OrkqhE,1089
@@ -302,11 +302,12 @@ omlish/marshal/iterables.py,sha256=6I_ZdJemLSQtJ4J5NrB9wi-eyxiJZS61HzHXp1yeiX8,2
 omlish/marshal/mappings.py,sha256=zhLtyot7tzQtBNj7C4RBxjMELxA5r2q2Mth8Br7xkFs,2803
 omlish/marshal/maybes.py,sha256=mgK3QsWHkXgRqo076KxYKH6elRxzJ_QDTodv93mgHR0,2198
 omlish/marshal/naming.py,sha256=lIklR_Od4x1ghltAgOzqcKhHs-leeSv2YmFhCHO7GIs,613
+omlish/marshal/nop.py,sha256=2mWve_dicFAiUQ2Y5asKkUW-XGmEE9Qi2ClIasFad0c,461
 omlish/marshal/numbers.py,sha256=oY_yMNJEnJhjfLh89gpPXvKqeUyhQcaTcQB6ecyHiG8,1704
 omlish/marshal/objects.py,sha256=8-w4Vc222gGGmTiTnUIIZBe1XXdAy0yo9aa1ZUAi1b4,8435
 omlish/marshal/optionals.py,sha256=r0XB5rqfasvgZJNrKYd6Unq2U4nHt3JURi26j0dYHlw,1499
 omlish/marshal/polymorphism.py,sha256=doA8aLUhna6aco5b2Ok3jsem1V4NsF3rM5RTfJt0a7U,5708
-omlish/marshal/primitives.py,sha256=wcvcs5GH_TWVmzAszh3dvyKibJgBxnXke-AlAXiwrrI,1107
+omlish/marshal/primitives.py,sha256=f_6m24Cb-FDGsZpYSas11nLt3xCCEUXugw3Hv4-aNhg,1291
 omlish/marshal/registries.py,sha256=FvC6qXHCizNB2QmU_N3orxW7iqfGYkiUXYYdTRWS6HA,2353
 omlish/marshal/standard.py,sha256=uQZIGiCwihmhB1tmhpKnZWZly0DDkdGjCnN0d41WHho,2985
 omlish/marshal/unions.py,sha256=ZWl0maHwh1V_cSnNmuCbbCQZzqlNtOModsTwnVTXNPA,2735
@@ -406,9 +407,9 @@ omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
-omlish-0.0.0.dev58.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev58.dist-info/METADATA,sha256=-icqkrn-C-DS9CnevAt4nCKPYw1Jtihk9afU-2S7w3Q,4167
-omlish-0.0.0.dev58.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omlish-0.0.0.dev58.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev58.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev58.dist-info/RECORD,,
+omlish-0.0.0.dev60.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev60.dist-info/METADATA,sha256=ywbae2f6yzK7ZJn0W83KHW9L1sTuH-Y7h4sf8pAl95k,4167
+omlish-0.0.0.dev60.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omlish-0.0.0.dev60.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev60.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev60.dist-info/RECORD,,