omdev 0.0.0.dev316__tar.gz → 0.0.0.dev318__tar.gz

{omdev-0.0.0.dev316/omdev.egg-info → omdev-0.0.0.dev318}/PKG-INFO

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

{omdev-0.0.0.dev316 → omdev-0.0.0.dev318}/omdev/.manifests.json

@@ -63,7 +63,7 @@
     "module": ".imgur",
     "attr": "_FOO_CLI_MODULE",
     "file": "omdev/imgur.py",
-    "line": 133,
+    "line": 136,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "imgur",

omdev-0.0.0.dev318/omdev/home/secrets.py

@@ -0,0 +1,90 @@
+import os.path
+import typing as ta
+
+from omlish import lang
+from omlish.secrets import all as sec
+
+from .paths import get_home_paths
+
+
+if ta.TYPE_CHECKING:
+    import yaml
+else:
+    yaml = lang.proxy_import('yaml')
+
+
+##
+
+
+SECRETS_FILE_ENV_VAR = 'OMLISH_SECRETS'
+DEFAULT_SECRETS_FILE_NAME = 'secrets.yml'
+
+
+def get_secrets_file() -> str:
+    return os.path.expanduser(
+        os.getenv(
+            SECRETS_FILE_ENV_VAR,
+            os.path.join(get_home_paths().config_dir, DEFAULT_SECRETS_FILE_NAME),
+        ),
+    )
+
+
+def load_secrets() -> sec.Secrets:
+    dct: dict[str, sec.Secret] = {}
+    try:
+        with open(get_secrets_file()) as f:
+            for k, v in yaml.safe_load(f).items():
+                if isinstance(v, str):
+                    dct[k] = sec.Secret(key=k, value=v)
+    except FileNotFoundError:
+        pass
+    return sec.MappingSecrets(dct)
+
+
+##
+
+
+def install_env_secrets(
+        *keys: str | tuple[str, str],
+        secrets: sec.Secrets | None = None,
+        environ: ta.MutableMapping[str, str] | None = None,
+        non_strict: bool = False,
+) -> None:
+    """This should not be used outside of being forced to interact with external code."""
+
+    if not keys:
+        raise ValueError('Must specify keys')
+
+    sk_ek_tups: list[tuple[str, str]] = []
+    for k in keys:
+        if isinstance(k, tuple):
+            sk, ek = k
+
+        elif isinstance(k, str):
+            if k.lower() == k:
+                sk, ek = k, k.upper()
+            elif k.upper() == k:
+                sk, ek = k.lower(), k
+            else:
+                raise ValueError(k)
+
+        else:
+            raise TypeError(k)
+
+        sk_ek_tups.append((sk, ek))
+
+    if secrets is None:
+        secrets = load_secrets()
+
+    if environ is None:
+        environ = os.environ
+
+    for sk, ek in sk_ek_tups:
+        try:
+            sv = secrets.get(sk)
+        except KeyError:
+            if non_strict:
+                continue
+            raise
+
+        environ[ek] = sv.reveal()

{omdev-0.0.0.dev316 → omdev-0.0.0.dev318}/omdev/imgur.py

@@ -66,11 +66,14 @@ class ImageUploadData:
 
 
 @dc.dataclass(frozen=True)
+@msh.update_object_metadata(unknown_field='x')
 class ImageUploadResponse:
     status: int
     success: bool
     data: ImageUploadData
 
+    x: ta.Mapping[str, ta.Any] | None = None
+
 
 DEFAULT_UPLOAD_IMAGE_URL = 'https://api.imgur.com/3/upload'
 

{omdev-0.0.0.dev316 → omdev-0.0.0.dev318}/omdev/scripts/ci.py

@@ -1303,9 +1303,11 @@ class _JustMaybe(_Maybe[T]):
     def __repr__(self) -> str:
         return f'just({self._v!r})'
 
+    _hash: int
+
     def __hash__(self) -> int:
         try:
-            return self._hash  # type: ignore[has-type]
+            return self._hash
         except AttributeError:
             pass
         h = self._hash = hash((_JustMaybe, self._v))

{omdev-0.0.0.dev316 → omdev-0.0.0.dev318}/omdev/scripts/interp.py

@@ -1245,9 +1245,11 @@ class _JustMaybe(_Maybe[T]):
     def __repr__(self) -> str:
         return f'just({self._v!r})'
 
+    _hash: int
+
     def __hash__(self) -> int:
         try:
-            return self._hash  # type: ignore[has-type]
+            return self._hash
         except AttributeError:
             pass
         h = self._hash = hash((_JustMaybe, self._v))

{omdev-0.0.0.dev316 → omdev-0.0.0.dev318}/omdev/scripts/pyproject.py

@@ -2661,9 +2661,11 @@ class _JustMaybe(_Maybe[T]):
     def __repr__(self) -> str:
         return f'just({self._v!r})'
 
+    _hash: int
+
     def __hash__(self) -> int:
         try:
-            return self._hash  # type: ignore[has-type]
+            return self._hash
         except AttributeError:
             pass
         h = self._hash = hash((_JustMaybe, self._v))

{omdev-0.0.0.dev316 → omdev-0.0.0.dev318/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev316 → omdev-0.0.0.dev318}/omdev.egg-info/requires.txt

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

{omdev-0.0.0.dev316 → omdev-0.0.0.dev318}/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.dev316'
+version = '0.0.0.dev318'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev316',
+    'omlish == 0.0.0.dev318',
 ]
 
 [project.optional-dependencies]

omdev-0.0.0.dev316/omdev/home/secrets.py

@@ -1,41 +0,0 @@
-import os.path
-import typing as ta
-
-from omlish import lang
-from omlish.secrets import all as sec
-
-from .paths import get_home_paths
-
-
-if ta.TYPE_CHECKING:
-    import yaml
-else:
-    yaml = lang.proxy_import('yaml')
-
-
-##
-
-
-SECRETS_FILE_ENV_VAR = 'OMLISH_SECRETS'
-DEFAULT_SECRETS_FILE_NAME = 'secrets.yml'
-
-
-def get_secrets_file() -> str:
-    return os.path.expanduser(
-        os.getenv(
-            SECRETS_FILE_ENV_VAR,
-            os.path.join(get_home_paths().config_dir, DEFAULT_SECRETS_FILE_NAME),
-        ),
-    )
-
-
-def load_secrets() -> sec.Secrets:
-    dct: dict[str, sec.Secret] = {}
-    try:
-        with open(get_secrets_file()) as f:
-            for k, v in yaml.safe_load(f).items():
-                if isinstance(v, str):
-                    dct[k] = sec.Secret(key=k, value=v)
-    except FileNotFoundError:
-        pass
-    return sec.MappingSecrets(dct)