omserv 0.0.0.dev30__tar.gz → 0.0.0.dev32__tar.gz

{omserv-0.0.0.dev30/omserv.egg-info → omserv-0.0.0.dev32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omserv
-Version: 0.0.0.dev30
+Version: 0.0.0.dev32
 Summary: omserv
 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.dev30
+Requires-Dist: omlish==0.0.0.dev32
 Provides-Extra: all
 Requires-Dist: h11~=0.14; extra == "all"
 Requires-Dist: h2~=4.1; extra == "all"

{omserv-0.0.0.dev30 → omserv-0.0.0.dev32}/omserv/nginx/build.py

@@ -1,4 +1,4 @@
-import multiprocessing
+import multiprocessing as mp
 import os.path
 import shutil
 import subprocess
@@ -102,7 +102,7 @@ def build_nginx() -> None:
 
     #
 
-    make_jobs = max(multiprocessing.cpu_count() // 2, 1)
+    make_jobs = max(mp.cpu_count() // 2, 1)
     subprocess.check_call([
         'make',
         f'-j{make_jobs}',

{omserv-0.0.0.dev30 → omserv-0.0.0.dev32}/omserv/server/__init__.py

@@ -9,7 +9,7 @@ TODO:
  - lifecycle / otp-ify
  - configify
 
-Lookit:
+See:
  - https://github.com/davidbrochart/anycorn
  - https://github.com/encode/starlette
  - https://github.com/tiangolo/fastapi

{omserv-0.0.0.dev30 → omserv-0.0.0.dev32}/omserv/server/multiprocess.py

@@ -1,5 +1,5 @@
 import functools
-import multiprocessing
+import multiprocessing as mp
 import multiprocessing.connection
 import multiprocessing.context
 import multiprocessing.synchronize
@@ -20,7 +20,7 @@ from .workers import serve
 
 
 async def check_multiprocess_shutdown_event(
-        shutdown_event: multiprocessing.synchronize.Event,
+        shutdown_event: mp.synchronize.Event,
         sleep: ta.Callable[[float], ta.Awaitable[ta.Any]],
 ) -> None:
     while True:
@@ -33,7 +33,7 @@ def _multiprocess_serve(
         app: AsgiFramework,
         config: Config,
         sockets: Sockets | None = None,
-        shutdown_event: multiprocessing.synchronize.Event | None = None,
+        shutdown_event: mp.synchronize.Event | None = None,
 ) -> None:
     if sockets is not None:
         for sock in sockets.insecure_sockets:
@@ -62,7 +62,7 @@ def serve_multiprocess(
     sockets = create_sockets(config)
 
     exitcode = 0
-    ctx = multiprocessing.get_context('spawn')
+    ctx = mp.get_context('spawn')
 
     active = True
     shutdown_event = ctx.Event()
@@ -72,7 +72,7 @@ def serve_multiprocess(
         shutdown_event.set()
         active = False
 
-    processes: list[multiprocessing.Process] = []
+    processes: list[mp.Process] = []
     while active:
         # Ignore SIGINT before creating the processes, so that they inherit the signal handling. This means that the
         # shutdown function controls the shutdown.
@@ -92,7 +92,7 @@ def serve_multiprocess(
             if hasattr(signal, signal_name):
                 signal.signal(getattr(signal, signal_name), shutdown)
 
-        multiprocessing.connection.wait(process.sentinel for process in processes)
+        mp.connection.wait(process.sentinel for process in processes)
 
         exitcode = _join_exited(processes)
         if exitcode != 0:
@@ -111,17 +111,17 @@ def serve_multiprocess(
 
 
 def _populate(
-        processes: list[multiprocessing.Process],
+        processes: list[mp.Process],
         app: AsgiFramework,
         config: Config,
         worker_func: ta.Callable,
         sockets: Sockets,
-        shutdown_event: multiprocessing.synchronize.Event,
-        ctx: multiprocessing.context.BaseContext,
+        shutdown_event: mp.synchronize.Event,
+        ctx: mp.context.BaseContext,
 ) -> None:
     num_workers = config.workers or 1
     if num_workers < 0:
-        num_workers = multiprocessing.cpu_count()
+        num_workers = mp.cpu_count()
     for _ in range(num_workers - len(processes)):
         process = ctx.Process(  # type: ignore
             target=worker_func,
@@ -145,7 +145,7 @@ def _populate(
             time.sleep(0.1)
 
 
-def _join_exited(processes: list[multiprocessing.Process]) -> int:
+def _join_exited(processes: list[mp.Process]) -> int:
     exitcode = 0
     for index in reversed(range(len(processes))):
         worker = processes[index]

{omserv-0.0.0.dev30 → omserv-0.0.0.dev32/omserv.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omserv
-Version: 0.0.0.dev30
+Version: 0.0.0.dev32
 Summary: omserv
 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.dev30
+Requires-Dist: omlish==0.0.0.dev32
 Provides-Extra: all
 Requires-Dist: h11~=0.14; extra == "all"
 Requires-Dist: h2~=4.1; extra == "all"

{omserv-0.0.0.dev30 → omserv-0.0.0.dev32}/omserv.egg-info/SOURCES.txt

@@ -5,8 +5,6 @@ pyproject.toml
 omserv/.manifests.json
 omserv/__about__.py
 omserv/__init__.py
-omserv/dbs.py
-omserv/secrets.py
 omserv.egg-info/PKG-INFO
 omserv.egg-info/SOURCES.txt
 omserv.egg-info/dependency_links.txt

{omserv-0.0.0.dev30 → omserv-0.0.0.dev32}/omserv.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev30
+omlish==0.0.0.dev32
 
 [all]
 h11~=0.14

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

omserv-0.0.0.dev30/omserv/dbs.py

@@ -1,24 +0,0 @@
-import os
-
-from .secrets import load_secrets  # noqa
-
-
-def get_secret_db_url() -> str:
-    cfg = load_secrets()
-    return f'postgresql+asyncpg://{cfg["postgres_user"]}:{cfg["postgres_pass"]}@{cfg["postgres_host"]}:5432'
-
-
-def get_docker_db_url() -> str:
-    from omlish import docker
-    cc = docker.ComposeConfig('omlish-', file_path='docker/compose.yml')
-    svc = cc.get_services()['postgres']
-    port = docker.get_compose_port(svc, 5432)
-    env = svc['environment']
-    return f'postgresql+asyncpg://{env["POSTGRES_USER"]}:{env["POSTGRES_PASSWORD"]}@127.0.0.1:{port}'
-
-
-def get_db_url() -> str:
-    if os.environ.get('PROD', '').lower() in ('1', 'true'):  # FIXME: lol
-        return get_secret_db_url()
-    else:
-        return get_docker_db_url()

omserv-0.0.0.dev30/omserv/secrets.py

@@ -1,12 +0,0 @@
-import os.path
-import typing as ta
-
-import yaml
-
-
-SECRETS_PATH = os.getenv('SECRETS_PATH', os.path.expanduser('~/Dropbox/.dotfiles/secrets.yml'))
-
-
-def load_secrets() -> dict[str, ta.Any]:
-    with open(SECRETS_PATH) as f:
-        return yaml.safe_load(f)