omdev 0.0.0.dev75__tar.gz → 0.0.0.dev76__tar.gz

{omdev-0.0.0.dev75/omdev.egg-info → omdev-0.0.0.dev76}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev75
+Version: 0.0.0.dev76
 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.dev75
+Requires-Dist: omlish==0.0.0.dev76
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev75 → omdev-0.0.0.dev76}/omdev/.manifests.json

@@ -47,6 +47,18 @@
       }
     }
   },
+  {
+    "module": ".imgur",
+    "attr": "_FOO_CLI_MODULE",
+    "file": "omdev/imgur.py",
+    "line": 130,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "imgur",
+        "mod_name": "omdev.imgur"
+      }
+    }
+  },
   {
     "module": ".interp.__main__",
     "attr": "_CLI_MODULE",

omdev-0.0.0.dev76/omdev/imgur.py

@@ -0,0 +1,135 @@
+"""
+TODO:
+ - auth cmd
+
+==
+
+https://planspace.org/2013/01/13/upload-images-to-your-imgur-account/
+
+https://api.imgur.com/oauth2/authorize?client_id=YOUR_CLIENT_ID&response_type=pin
+
+curl \
+  -X POST \
+  -F "client_id=YOUR_CLIENT_ID" \
+  -F "client_secret=YOUR_CLIENT_SECRET" \
+  -F "grant_type=pin" \
+  -F "pin=YOUR_PIN" \
+  https://api.imgur.com/oauth2/token
+
+curl \
+  -X POST \
+  -H "Authorization: Bearer YOUR_ACCESS_TOKEN" \
+  -F "image=@PATH_TO_YOUR_IMAGE_FILE" \
+  https://api.imgur.com/3/upload
+"""
+import dataclasses as dc
+import os.path
+import typing as ta
+
+from omlish import check
+from omlish import http as hu
+from omlish import marshal as msh
+from omlish.formats import json
+from omlish.secrets import Secret
+
+from .cli import CliModule
+from .secrets import load_secrets
+
+
+@dc.dataclass(frozen=True)
+@msh.update_object_metadata(unknown_field='x')
+class ImageUploadData:
+    id: str
+    deletehash: str  # noqa
+    account_id: int
+    account_url: str
+    title: str
+    description: str
+    name: str
+    type: str
+    width: int
+    height: int
+    size: int
+    views: int
+    animated: bool
+    has_sound: bool
+    link: str
+    tags: ta.Sequence[str]
+    datetime: int
+    mp4: str
+    hls: str
+
+    x: ta.Mapping[str, ta.Any] | None = None
+
+
+@dc.dataclass(frozen=True)
+class ImageUploadResponse:
+    status: int
+    success: bool
+    data: ImageUploadData
+
+
+DEFAULT_UPLOAD_IMAGE_URL = 'https://api.imgur.com/3/upload'
+
+
+def upload_image(
+        file_name: str,
+        file_data: bytes,
+        auth_key: Secret | str,
+        *,
+        url: str = DEFAULT_UPLOAD_IMAGE_URL,
+        client: hu.HttpClient | None = None,
+) -> ImageUploadResponse:
+    me = hu.MultipartEncoder([
+        hu.MultipartField(
+            file_data,
+            b'image',
+            file_name.encode(),
+            headers=[(hu.consts.HEADER_CONTENT_TYPE, hu.consts.CONTENT_TYPE_BYTES)],
+        ),
+    ])
+
+    resp = hu.request(
+        url,
+        headers={
+            hu.consts.HEADER_AUTH: hu.consts.format_bearer_auth_header(Secret.of(auth_key).reveal()),
+            hu.consts.HEADER_CONTENT_TYPE: me.content_type().decode(),
+        },
+        data=me.content(),
+        check=True,
+        client=client,
+    )
+
+    return msh.unmarshal(json.loads(check.not_none(resp.data).decode('utf-8')), ImageUploadResponse)
+
+
+def _main() -> None:
+    from omlish import argparse as ap
+
+    class Cli(ap.Cli):
+        @ap.command(
+            ap.arg('file'),
+        )
+        def upload(self) -> None:
+            file = self.args.file
+            file_name = os.path.basename(file)
+            with open(file, 'rb') as f:
+                file_data = f.read()
+
+            resp = upload_image(
+                file_name,
+                file_data,
+                load_secrets().get('imgur_client_access_token'),
+            )
+
+            print(resp.data.link)
+
+    Cli().call_and_exit()
+
+
+# @omlish-manifest
+_FOO_CLI_MODULE = CliModule('imgur', __name__)
+
+
+if __name__ == '__main__':
+    _main()

{omdev-0.0.0.dev75 → omdev-0.0.0.dev76}/omdev/tools/dockertools.py

@@ -123,17 +123,17 @@ class Cli(ap.Cli):
 
             services = check.isinstance(
                 check.single(
-                    v.value  # type: ignore
+                    v.value
                     for k, v in root.items()
-                    if k.value == 'services'  # type: ignore
+                    if k.value == 'services'
                 ),
                 ta.Mapping,
             )
             for name_w, cfg_w in services.items():
-                name = check.isinstance(name_w.value, str)  # type: ignore
-                cfg = check.isinstance(cfg_w.value, ta.Mapping)  # type: ignore
+                name = check.isinstance(name_w.value, str)
+                cfg = check.isinstance(cfg_w.value, ta.Mapping)
 
-                ports = check.opt_single(v.value for k, v in cfg.items() if k.value == 'ports')  # type: ignore
+                ports = check.opt_single(v.value for k, v in cfg.items() if k.value == 'ports')
                 if not ports:
                     continue
 

{omdev-0.0.0.dev75 → omdev-0.0.0.dev76/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev75
+Version: 0.0.0.dev76
 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.dev75
+Requires-Dist: omlish==0.0.0.dev76
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev75 → omdev-0.0.0.dev76}/omdev.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ omdev/cmake.py
 omdev/findimports.py
 omdev/findmagic.py
 omdev/git.py
+omdev/imgur.py
 omdev/revisions.py
 omdev/secrets.py
 omdev/tokens.py

{omdev-0.0.0.dev75 → omdev-0.0.0.dev76}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev75
+omlish==0.0.0.dev76
 
 [all]
 black~=24.10

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