omdev 0.0.0.dev372__tar.gz → 0.0.0.dev373__tar.gz

{omdev-0.0.0.dev372/omdev.egg-info → omdev-0.0.0.dev373}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev372
+Version: 0.0.0.dev373
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev372
+Requires-Dist: omlish==0.0.0.dev373
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev372 → omdev-0.0.0.dev373}/omdev/.manifests.json

@@ -71,6 +71,21 @@
       }
     }
   },
+  {
+    "module": ".intellij.cli",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/intellij/cli.py",
+    "line": 81,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": [
+          "intellij",
+          "ij"
+        ],
+        "mod_name": "omdev.intellij.cli"
+      }
+    }
+  },
   {
     "module": ".interp.__main__",
     "attr": "_CLI_MODULE",
@@ -378,21 +393,6 @@
       }
     }
   },
-  {
-    "module": ".tools.intellij",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/tools/intellij.py",
-    "line": 248,
-    "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": [
-          "intellij",
-          "ij"
-        ],
-        "mod_name": "omdev.tools.intellij"
-      }
-    }
-  },
   {
     "module": ".tools.json.__main__",
     "attr": "_CLI_MODULE",

omdev-0.0.0.dev373/omdev/intellij/__init__.py

@@ -0,0 +1,11 @@
+from .ides import (  # noqa
+    Ide,
+
+    infer_directory_ide,
+
+    get_ide_version,
+)
+
+from .open import (  # noqa
+    open_ide,
+)

omdev-0.0.0.dev373/omdev/intellij/cli.py

@@ -0,0 +1,86 @@
+"""
+TODO:
+ - PyCharm.app/Contents/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_constants.py -> USE_LOW_IMPACT_MONITORING
+ - DISPLAY=":1" - ls /tmp/.X11-unix/X1 ?
+  - https://unix.stackexchange.com/questions/17255/is-there-a-command-to-list-all-open-displays-on-a-machine
+  - w -oush
+"""
+import inspect
+import os.path
+import subprocess
+import tempfile
+
+from omlish.argparse import all as ap
+
+from ..cli import CliModule
+from .ides import Ide
+from .ides import get_ide_version
+from .ides import infer_directory_ide
+from .open import open_ide
+
+
+##
+
+
+class IntellijCli(ap.Cli):
+    @ap.cmd(
+        ap.arg('python-exe'),
+        ap.arg('args', nargs=ap.REMAINDER),
+    )
+    def pycharm_runhack(self) -> int:
+        if not os.path.isfile(exe := self.args.python_exe):
+            raise FileNotFoundError(exe)
+
+        from omlish.diag._pycharm import runhack  # noqa
+        src = inspect.getsource(runhack)
+
+        src_file = tempfile.mktemp(__package__ + '-runhack')  # noqa
+        with open(src_file, 'w') as f:
+            f.write(src)
+
+        proc = subprocess.run([exe, src_file, *self.args.args], check=False)
+        return proc.returncode
+
+    #
+
+    def _get_ide(
+            self,
+            *,
+            cwd: str | None = None,
+    ) -> Ide:  # noqa
+        if (ai := self.args.ide) is not None:
+            return Ide[ai.upper()]  # noqa
+
+        if (ii := infer_directory_ide(cwd)) is not None:
+            return ii
+
+        return Ide.PYCHARM
+
+    @ap.cmd(
+        ap.arg('-e', '--ide'),
+    )
+    def version(self) -> None:
+        i = self._get_ide()
+        v = get_ide_version(i)
+        print(v)
+
+    @ap.cmd(
+        ap.arg('dir', nargs='?'),
+        ap.arg('-e', '--ide'),
+    )
+    def open(self) -> None:
+        dir = os.path.abspath(self.args.dir or '.')  # noqa
+        ide = self._get_ide(cwd=dir)
+        open_ide(dir, ide=ide)
+
+
+def _main() -> None:
+    IntellijCli()(exit=True)
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule(['intellij', 'ij'], __name__)
+
+
+if __name__ == '__main__':
+    _main()

omdev-0.0.0.dev373/omdev/intellij/ides.py

@@ -0,0 +1,85 @@
+"""
+TODO:
+ - read .idea/ for inference?
+"""
+import enum
+import os.path
+import typing as ta
+
+from omlish.diag.pycharm import get_pycharm_version
+
+
+##
+
+
+class Ide(enum.Enum):
+    PYCHARM = enum.auto()
+    IDEA = enum.auto()
+    CLION = enum.auto()
+    WEBSTORM = enum.auto()
+    GOLAND = enum.auto()
+
+
+##
+
+
+_INFER_FILE_NAME_SETS_BY_IDE: ta.Mapping[Ide, ta.AbstractSet[str]] = {
+    Ide.PYCHARM: frozenset([
+        'setup.py',
+        'setup.cfg',
+        'pyproject.toml',
+        'requirements.txt',
+        'Pipfile',
+        'poetry.lock',
+        '.python-version',
+        'wsgi.py',
+        'asgi.py',
+        'manage.py',
+    ]),
+    Ide.IDEA: frozenset([
+        'pom.xml',
+        'mvnw',
+        'build.gradle',
+        'build.gradle.kts',
+        'gradlew',
+        'module-info.java',
+        '.java-version',
+    ]),
+    Ide.CLION: frozenset([
+        'CMakeLists.txt',
+        'configure.ac',
+        'configure.in',
+        'config.h.in',
+        'vcpkg.json',
+    ]),
+    Ide.WEBSTORM: frozenset([
+        'package.json',
+        'package-lock.json',
+    ]),
+    Ide.GOLAND: frozenset([
+        'go.mod',
+        'go.sum',
+    ]),
+}
+
+
+def infer_directory_ide(cwd: str | None) -> Ide | None:
+    if cwd is None:
+        cwd = os.getcwd()
+
+    for i, fs in _INFER_FILE_NAME_SETS_BY_IDE.items():
+        for f in fs:
+            if os.path.exists(os.path.join(cwd, f)):
+                return i
+
+    return None
+
+
+##
+
+
+def get_ide_version(ide: Ide) -> str:
+    if ide is Ide.PYCHARM:
+        return get_pycharm_version()
+    else:
+        raise ValueError(ide)

omdev-0.0.0.dev373/omdev/intellij/open.py

@@ -0,0 +1,113 @@
+import dataclasses as dc
+import os.path
+import shlex
+import subprocess
+import sys
+import tempfile
+import typing as ta
+
+from .ides import Ide
+from .ides import infer_directory_ide
+
+
+##
+
+
+_DARWIN_OPEN_SCRIPT_APP_BY_IDE: ta.Mapping[Ide, str] = {
+    Ide.PYCHARM: 'PyCharm',
+    Ide.CLION: 'CLion',
+    Ide.IDEA: 'IntelliJ IDEA',
+    Ide.WEBSTORM: 'WebStorm',
+    Ide.GOLAND: 'GoLand',
+}
+
+_DARWIN_OPEN_SCRIPT = """
+tell application "{app}"
+    activate
+    open "{dir}"
+end tell
+return
+"""
+
+
+#
+
+
+_LINUX_WM_CLASS_BY_IDE: ta.Mapping[Ide, str] = {
+    Ide.PYCHARM: 'jetbrains-pycharm.jetbrains-pycharm',
+    Ide.CLION: 'jetbrains-clion.jetbrains-clion',
+    Ide.IDEA: 'jetbrains-idea.jetbrains-idea',
+    Ide.WEBSTORM: 'jetbrains-webstorm.jetbrains-webstorm',
+    Ide.GOLAND: 'jetbrains-goland.jetbrains-goland',
+}
+
+
+# sudo apt install xdotool wmctrl
+# TODO: nohup pycharm.sh "$PROJECT_PATH" > /dev/null 2>&1 & ?
+_LINUX_OPEN_SCRIPT = """
+xdotool key --delay 1000 alt+f alt+o
+xdotool type --delay 1000 {dir}
+xdotool key Return
+"""
+
+
+@dc.dataclass(frozen=True)
+class _WmctrlLine:
+    window_id: str
+    desktop_id: str
+    pid: str
+    wm_class: str
+    user: str
+    title: str
+
+
+# TODO: https://stackoverflow.com/a/79016360
+def _parse_wmctrl_lxp_line(l: str) -> _WmctrlLine:
+    return _WmctrlLine(*l.strip().split(maxsplit=5))
+
+
+#
+
+
+def open_ide(
+        dir: str,  # noqa
+        *,
+        ide: Ide | None = None,
+        default_ide: Ide = Ide.PYCHARM,
+) -> None:
+    if ide is None:
+        if (ide := infer_directory_ide(dir)) is None:
+            ide = default_ide
+
+    if (plat := sys.platform) == 'darwin':
+        if '"' in dir:
+            raise ValueError(dir)
+
+        scpt_src = _DARWIN_OPEN_SCRIPT.format(
+            app=_DARWIN_OPEN_SCRIPT_APP_BY_IDE[ide],
+            dir=dir,
+        )
+
+        scpt_file = tempfile.mktemp(__package__ + '-intellij-open')  # noqa
+        with open(scpt_file, 'w') as f:
+            f.write(scpt_src)
+
+        subprocess.check_call(['osascript', scpt_file])
+
+    elif plat == 'linux':
+        env = os.environ
+        env.setdefault('DISPLAY', ':1')
+
+        wmc_out = subprocess.check_output(['wmctrl', '-lxp'], env=env).decode()
+        wls = [_parse_wmctrl_lxp_line(l) for l in wmc_out.splitlines()]
+        tgt_wmc = _LINUX_WM_CLASS_BY_IDE[ide]
+        tgt_wl = next(wl for wl in wls if wl.wm_class == tgt_wmc)
+        subprocess.check_call(['wmctrl', '-ia', tgt_wl.window_id], env=env)
+
+        scpt = _LINUX_OPEN_SCRIPT.format(dir=shlex.quote(os.path.expanduser(dir)))
+        print(scpt)
+        # subprocess.check_call(scpt, shell=True, env=env)  # noqa
+        raise NotImplementedError
+
+    else:
+        raise OSError(plat)

{omdev-0.0.0.dev372 → omdev-0.0.0.dev373}/omdev/scripts/ci.py

@@ -4753,7 +4753,6 @@ inj = InjectionApi()
 """
 TODO:
  - pickle stdlib objs? have to pin to 3.8 pickle protocol, will be cross-version
- - literals
  - Options.sequence_cls = list, mapping_cls = dict, ... - def with_mutable_containers() -> Options
 """
 
@@ -4867,6 +4866,28 @@ class OptionalObjMarshaler(ObjMarshaler):
         return self.item.unmarshal(o, ctx)
 
 
+@dc.dataclass(frozen=True)
+class PrimitiveUnionObjMarshaler(ObjMarshaler):
+    pt: ta.Tuple[type, ...]
+    x: ta.Optional[ObjMarshaler] = None
+
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if isinstance(o, self.pt):
+            return o
+        elif self.x is not None:
+            return self.x.marshal(o, ctx)
+        else:
+            raise TypeError(o)
+
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if isinstance(o, self.pt):
+            return o
+        elif self.x is not None:
+            return self.x.unmarshal(o, ctx)
+        else:
+            raise TypeError(o)
+
+
 @dc.dataclass(frozen=True)
 class LiteralObjMarshaler(ObjMarshaler):
     item: ObjMarshaler
@@ -5065,6 +5086,13 @@ _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES: ta.Dict[ta.Any, type] = {
     collections.abc.MutableSequence: list,
 }
 
+_OBJ_MARSHALER_PRIMITIVE_TYPES: ta.Set[type] = {
+    int,
+    float,
+    bool,
+    str,
+}
+
 
 ##
 
@@ -5213,8 +5241,16 @@ class ObjMarshalerManager:
 
         if is_literal_type(ty):
             lvs = frozenset(get_literal_type_args(ty))
+            if None in lvs:
+                is_opt = True
+                lvs -= frozenset([None])
+            else:
+                is_opt = False
             lty = check.single(set(map(type, lvs)))
-            return LiteralObjMarshaler(rec(lty), lvs)
+            lm: ObjMarshaler = LiteralObjMarshaler(rec(lty), lvs)
+            if is_opt:
+                lm = OptionalObjMarshaler(lm)
+            return lm
 
         if is_generic_alias(ty):
             try:
@@ -5234,7 +5270,31 @@ class ObjMarshalerManager:
                 return IterableObjMarshaler(st, rec(e))
 
             if is_union_alias(ty):
-                return OptionalObjMarshaler(rec(get_optional_alias_arg(ty)))
+                uts = frozenset(ta.get_args(ty))
+                if None in uts or type(None) in uts:
+                    is_opt = True
+                    uts = frozenset(ut for ut in uts if ut not in (None, type(None)))
+                else:
+                    is_opt = False
+
+                um: ObjMarshaler
+                if not uts:
+                    raise TypeError(ty)
+                elif len(uts) == 1:
+                    um = rec(check.single(uts))
+                else:
+                    pt = tuple({ut for ut in uts if ut in _OBJ_MARSHALER_PRIMITIVE_TYPES})
+                    np_uts = {ut for ut in uts if ut not in _OBJ_MARSHALER_PRIMITIVE_TYPES}
+                    if not np_uts:
+                        um = PrimitiveUnionObjMarshaler(pt)
+                    elif len(np_uts) == 1:
+                        um = PrimitiveUnionObjMarshaler(pt, x=rec(check.single(np_uts)))
+                    else:
+                        raise TypeError(ty)
+
+                if is_opt:
+                    um = OptionalObjMarshaler(um)
+                return um
 
         raise TypeError(ty)
 

{omdev-0.0.0.dev372 → omdev-0.0.0.dev373}/omdev/scripts/pyproject.py

@@ -5508,7 +5508,6 @@ inj = InjectionApi()
 """
 TODO:
  - pickle stdlib objs? have to pin to 3.8 pickle protocol, will be cross-version
- - literals
  - Options.sequence_cls = list, mapping_cls = dict, ... - def with_mutable_containers() -> Options
 """
 
@@ -5622,6 +5621,28 @@ class OptionalObjMarshaler(ObjMarshaler):
         return self.item.unmarshal(o, ctx)
 
 
+@dc.dataclass(frozen=True)
+class PrimitiveUnionObjMarshaler(ObjMarshaler):
+    pt: ta.Tuple[type, ...]
+    x: ta.Optional[ObjMarshaler] = None
+
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if isinstance(o, self.pt):
+            return o
+        elif self.x is not None:
+            return self.x.marshal(o, ctx)
+        else:
+            raise TypeError(o)
+
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if isinstance(o, self.pt):
+            return o
+        elif self.x is not None:
+            return self.x.unmarshal(o, ctx)
+        else:
+            raise TypeError(o)
+
+
 @dc.dataclass(frozen=True)
 class LiteralObjMarshaler(ObjMarshaler):
     item: ObjMarshaler
@@ -5820,6 +5841,13 @@ _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES: ta.Dict[ta.Any, type] = {
     collections.abc.MutableSequence: list,
 }
 
+_OBJ_MARSHALER_PRIMITIVE_TYPES: ta.Set[type] = {
+    int,
+    float,
+    bool,
+    str,
+}
+
 
 ##
 
@@ -5968,8 +5996,16 @@ class ObjMarshalerManager:
 
         if is_literal_type(ty):
             lvs = frozenset(get_literal_type_args(ty))
+            if None in lvs:
+                is_opt = True
+                lvs -= frozenset([None])
+            else:
+                is_opt = False
             lty = check.single(set(map(type, lvs)))
-            return LiteralObjMarshaler(rec(lty), lvs)
+            lm: ObjMarshaler = LiteralObjMarshaler(rec(lty), lvs)
+            if is_opt:
+                lm = OptionalObjMarshaler(lm)
+            return lm
 
         if is_generic_alias(ty):
             try:
@@ -5989,7 +6025,31 @@ class ObjMarshalerManager:
                 return IterableObjMarshaler(st, rec(e))
 
             if is_union_alias(ty):
-                return OptionalObjMarshaler(rec(get_optional_alias_arg(ty)))
+                uts = frozenset(ta.get_args(ty))
+                if None in uts or type(None) in uts:
+                    is_opt = True
+                    uts = frozenset(ut for ut in uts if ut not in (None, type(None)))
+                else:
+                    is_opt = False
+
+                um: ObjMarshaler
+                if not uts:
+                    raise TypeError(ty)
+                elif len(uts) == 1:
+                    um = rec(check.single(uts))
+                else:
+                    pt = tuple({ut for ut in uts if ut in _OBJ_MARSHALER_PRIMITIVE_TYPES})
+                    np_uts = {ut for ut in uts if ut not in _OBJ_MARSHALER_PRIMITIVE_TYPES}
+                    if not np_uts:
+                        um = PrimitiveUnionObjMarshaler(pt)
+                    elif len(np_uts) == 1:
+                        um = PrimitiveUnionObjMarshaler(pt, x=rec(check.single(np_uts)))
+                    else:
+                        raise TypeError(ty)
+
+                if is_opt:
+                    um = OptionalObjMarshaler(um)
+                return um
 
         raise TypeError(ty)
 

{omdev-0.0.0.dev372 → omdev-0.0.0.dev373/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev372
+Version: 0.0.0.dev373
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev372
+Requires-Dist: omlish==0.0.0.dev373
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev372 → omdev-0.0.0.dev373}/omdev.egg-info/SOURCES.txt

@@ -142,6 +142,10 @@ omdev/home/__init__.py
 omdev/home/paths.py
 omdev/home/secrets.py
 omdev/home/shadow.py
+omdev/intellij/__init__.py
+omdev/intellij/cli.py
+omdev/intellij/ides.py
+omdev/intellij/open.py
 omdev/interp/__init__.py
 omdev/interp/__main__.py
 omdev/interp/cli.py
@@ -277,7 +281,6 @@ omdev/tools/cloc.py
 omdev/tools/diff.py
 omdev/tools/doc.py
 omdev/tools/docker.py
-omdev/tools/intellij.py
 omdev/tools/linehisto.py
 omdev/tools/mkenv.py
 omdev/tools/notebook.py

{omdev-0.0.0.dev372 → omdev-0.0.0.dev373}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev372
+omlish==0.0.0.dev373
 
 [all]
 black~=25.1

{omdev-0.0.0.dev372 → omdev-0.0.0.dev373}/pyproject.toml

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