omdev 0.0.0.dev41__tar.gz → 0.0.0.dev42__tar.gz

{omdev-0.0.0.dev41/omdev.egg-info → omdev-0.0.0.dev42}/PKG-INFO

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

{omdev-0.0.0.dev41 → omdev-0.0.0.dev42}/omdev/.manifests.json

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

{omdev-0.0.0.dev41 → omdev-0.0.0.dev42}/omdev/cache/data/cache.py

@@ -10,11 +10,14 @@ TODO:
  - chaining? or is this compcache..
  - download resume ala hf_hub
 """
+import contextlib
 import logging
 import os.path
 import shutil
 import subprocess
 import tempfile
+import typing as ta
+import urllib.error
 import urllib.parse
 import urllib.request
 
@@ -40,6 +43,57 @@ log = logging.getLogger(__name__)
 ##
 
 
+def _url_retrieve(
+        req: urllib.request.Request,
+        out_file: str | None = None,
+) -> tuple[str, ta.Any]:
+    p = urllib.parse.urlparse(req.full_url)
+
+    with contextlib.ExitStack() as es:
+        fp = es.enter_context(contextlib.closing(urllib.request.urlopen(req)))  # noqa
+
+        headers = fp.info()
+
+        # Just return the local path and the "headers" for file:// URLs. No sense in performing a copy unless requested.
+        if p.scheme == 'file' and not out_file:
+            return os.path.normpath(p.path), headers
+
+        success = False
+
+        tfp: ta.Any
+        if out_file:
+            tfp = es.enter_context(open(out_file, 'wb'))
+
+        else:
+            tfp = es.enter_context(tempfile.NamedTemporaryFile(delete=False))
+            out_file = tfp.name
+
+            def _cleanup():
+                if not success and out_file:
+                    os.unlink(out_file)
+
+            es.enter_context(lang.defer(_cleanup))  # noqa
+
+        result = out_file, headers
+        size = -1
+        read = 0
+        if 'content-length' in headers:
+            size = int(headers['Content-Length'])
+
+        while block := fp.read(1024 * 8):
+            read += len(block)
+            tfp.write(block)
+
+    if size >= 0 and read < size:
+        raise urllib.error.ContentTooShortError(
+            f'retrieval incomplete: got only {read} out of {size} bytes',
+            result,  # type: ignore
+        )
+
+    success = True
+    return result  # type: ignore
+
+
 class Cache:
     def __init__(self, base_dir: str) -> None:
         super().__init__()
@@ -49,16 +103,32 @@ class Cache:
 
     #
 
-    def _fetch_url(self, url: str, out_file: str) -> None:
+    def _fetch_url(
+            self,
+            url: str,
+            out_file: str,
+            *,
+            headers: ta.Mapping[str, str] | None = None,
+    ) -> None:
         log.info('Fetching url: %s -> %s', url, out_file)
 
-        urllib.request.urlretrieve(url, out_file)  # noqa
+        _url_retrieve(
+            urllib.request.Request(  # noqa
+                url,
+                **(dict(headers=headers) if headers is not None else {}),  # type: ignore
+            ),
+            out_file,
+        )
 
     def _fetch_into(self, spec: Spec, data_dir: str) -> None:
         log.info('Fetching spec: %s %r -> %s', spec.digest, spec, data_dir)
 
         if isinstance(spec, UrlSpec):
-            self._fetch_url(spec.url, os.path.join(data_dir, spec.file_name_or_default))
+            self._fetch_url(
+                spec.url,
+                os.path.join(data_dir, spec.file_name_or_default),
+                headers=spec.headers,
+            )
 
         elif isinstance(spec, GithubContentSpec):
             for repo_file in spec.files:
@@ -104,7 +174,7 @@ class Cache:
 
     def _perform_action(self, action: Action, data_dir: str) -> None:
         if isinstance(action, ExtractAction):
-            for f in action.files:
+            for f in [action.files] if isinstance(action.files, str) else action.files:
                 file = os.path.join(data_dir, f)
                 if not os.path.isfile(file):
                     raise Exception(f'Not file: {file}')

{omdev-0.0.0.dev41 → omdev-0.0.0.dev42}/omdev/cache/data/specs.py

@@ -1,4 +1,5 @@
 import hashlib
+import operator
 import typing as ta
 import urllib.parse
 import urllib.request
@@ -59,6 +60,10 @@ class UrlSpec(Spec):
     url: str = dc.xfield(validate=lambda u: bool(urllib.parse.urlparse(u)))
     file_name: str | None = None
 
+    _: dc.KW_ONLY
+
+    headers: ta.Mapping[str, str] | None = dc.field(default=None) | msh.update_field_metadata(omit_if=operator.not_)
+
     @cached.property
     def file_name_or_default(self) -> str:
         if self.file_name is not None:

omdev-0.0.0.dev42/omdev/cli/clicmds.py

@@ -0,0 +1,81 @@
+import argparse
+import inspect
+import os
+import subprocess
+import sys
+
+from omlish import __about__
+
+from . import install
+from .types import CliModule
+
+
+def _print_version(args) -> None:
+    print(__about__.__version__)
+
+
+def _print_revision(args) -> None:
+    print(__about__.__revision__)
+
+
+def _reinstall(args) -> None:
+    mod_name = globals()['__spec__'].name
+    tool_name = '.'.join([mod_name.partition('.')[0], 'tools', 'piptools'])
+
+    out = subprocess.check_output([
+        sys.executable,
+        '-m',
+        tool_name,
+        'list-root-dists',
+    ]).decode()
+
+    deps = sorted(
+        ({s for l in out.splitlines() if (s := l.strip())} | set(args.extra_deps or []))
+        - {install.DEFAULT_CLI_PKG}  # noqa
+    )
+
+    if deps:
+        print('Reinstalling with following additional dependencies:')
+        print('\n'.join('  ' + d for d in deps))
+    else:
+        print('No additional dependencies detected.')
+    print()
+    print('Continue with reinstall? (ctrl-c to cancel)')
+    input()
+
+    install_src = inspect.getsource(install)
+
+    os.execl(
+        sys.executable,
+        '-c',
+        install_src,
+    )
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('cli', __name__)
+
+
+def _main(argv=None) -> None:
+    parser = argparse.ArgumentParser()
+    subparsers = parser.add_subparsers()
+
+    parser_version = subparsers.add_parser('version')
+    parser_version.set_defaults(func=_print_version)
+
+    parser_revision = subparsers.add_parser('revision')
+    parser_revision.set_defaults(func=_print_revision)
+
+    parser_reinstall = subparsers.add_parser('reinstall')
+    parser_reinstall.add_argument('extra_deps', nargs='*')
+    parser_reinstall.set_defaults(func=_reinstall)
+
+    args = parser.parse_args(argv)
+    if not getattr(args, 'func', None):
+        parser.print_help()
+    else:
+        args.func(args)
+
+
+if __name__ == '__main__':
+    _main()

{omdev-0.0.0.dev41 → omdev-0.0.0.dev42}/omdev/cli/main.py

@@ -10,8 +10,8 @@ import argparse
 import os
 import runpy
 import sys
+import typing as ta
 
-from omlish import __about__
 from omlish import check
 
 from ..manifests.load import ManifestLoader
@@ -23,18 +23,7 @@ from .types import CliModule
 ##
 
 
-def _print_version() -> None:
-    print(__about__.__version__)
-
-
-def _print_revision() -> None:
-    print(__about__.__revision__)
-
-
-_CLI_FUNCS = [
-    CliFunc('version', _print_version),
-    CliFunc('revision', _print_revision),
-]
+_CLI_FUNCS: ta.Sequence[CliFunc] = []
 
 
 ##

{omdev-0.0.0.dev41 → omdev-0.0.0.dev42/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev41 → omdev-0.0.0.dev42}/omdev.egg-info/SOURCES.txt

@@ -65,6 +65,7 @@ omdev/cexts/_distutils/compilers/options.py
 omdev/cexts/_distutils/compilers/unixccompiler.py
 omdev/cli/__init__.py
 omdev/cli/__main__.py
+omdev/cli/clicmds.py
 omdev/cli/install.py
 omdev/cli/main.py
 omdev/cli/types.py

{omdev-0.0.0.dev41 → omdev-0.0.0.dev42}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev41
+omlish==0.0.0.dev42
 
 [all]
 pycparser~=2.22

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