omserv 0.0.0.dev30__py3-none-any.whl → 0.0.0.dev32__py3-none-any.whl

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/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/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.dist-info → omserv-0.0.0.dev32.dist-info}/METADATA

@@ -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.dist-info → omserv-0.0.0.dev32.dist-info}/RECORD

@@ -1,8 +1,6 @@
 omserv/.manifests.json,sha256=N1F-Xz3GaBn2H1p7uKzhkhKCQV8QVR0t76XD6wmFtXA,3
 omserv/__about__.py,sha256=Jq3euIDPxnlPJtzRKXwdeUuDLrKJOYurvsYAOieXVKQ,695
 omserv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omserv/dbs.py,sha256=RLXwNmENmM9MLsjFqDho_R8ibMjOKAxWUn4zhzTlP9Y,756
-omserv/secrets.py,sha256=ja0VsCB01MHxYwn5OHjFeXV9cRah9AQl-0uJzZELpic,256
 omserv/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omserv/apps/base.py,sha256=KSwxbC0_fY87_DucvpEOHG6gZ2wL78D-N3We8RTEU4Q,385
 omserv/apps/inject.py,sha256=xtcn-C3A4yCdHfnAaejxrC_UGMVBYmWtSxeESIkorP0,2697
@@ -11,7 +9,7 @@ omserv/apps/routes.py,sha256=shcN8qCSF2YoKal7nk-lemCAK3RX8MuHgNHhq_CTnh0,3762
 omserv/apps/sessions.py,sha256=glruQSbOSbCYLPp6nDRNSHCyp5hj4oiOPhh3R0F9BTM,1537
 omserv/apps/templates.py,sha256=PBRZHIF9UbnFnq-4EC6RmPeRkeH8lCBbpJkSdseHs6A,2125
 omserv/nginx/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omserv/nginx/build.py,sha256=NsDZKUJwxkcWeMbmg4Qtcz3nAVFfex_g4RazZOzF1u4,3152
+omserv/nginx/build.py,sha256=zt7e7Jt4R3Nfq-aosBgChdbK0O85oKIOBJmnupsk27o,3145
 omserv/nginx/configs.py,sha256=4oQDcKJKIatRG621qiZCYTayJI3-vv63TtRCiUxEVWI,2008
 omserv/nginx/stubstatus.py,sha256=_VnXZdXxSA7jIelYSwJLf9mOnt_UOvpWghAPWtlWSLw,1857
 omserv/nginx/patches/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -21,13 +19,13 @@ omserv/node/models.py,sha256=EOaq-aW1rbGOzHTmTULhbVwV5j_burL07qh2QO9smdM,1273
 omserv/node/registry.py,sha256=y-2I0TDriNORuOGLJshhPlzp820YEL-bDmGa1Xrs_E4,3474
 omserv/node/sql.py,sha256=vy7RP50JiH3jQHMVa7Hxk0pFJK3QcbGeTvyNppB1W4I,2826
 omserv/server/LICENSE,sha256=VKPNmbyrS9wcwcx20hBlVtLP01brb2dByHrWHeNLPag,1050
-omserv/server/__init__.py,sha256=K8l4nfv9c_5o8dph-SyadW_19CdTC2FGlikyHMU5lAU,375
+omserv/server/__init__.py,sha256=7c9pUvoC-3lByJeGoQfAcp78JCZ9oA5wP0Bzpm87D7Y,372
 omserv/server/config.py,sha256=oGWL1kuk45bJ6sVr8n3ow5Q-1nz9EqByjoykU2iOHIY,1189
 omserv/server/debug.py,sha256=N7RI0Jj-ttmys3DJD0RREmGG5XZpTCp6y9Yu0x98Agg,299
 omserv/server/events.py,sha256=VMr_rArsVjJYnyH9SqLWtOLUg18vSu1O0ep9gNBGR_c,1369
 omserv/server/headers.py,sha256=3H-NxMMQg5WuF5wF4AWFUEqkToh4NqNqHouavzbOQok,1188
 omserv/server/lifespans.py,sha256=kRVxDQM18jCBzRUpafyb69q_bGSCyxxjAtrkxjqcZdE,4607
-omserv/server/multiprocess.py,sha256=xEQ4Na-Nej3oO_cxvYmQ1vEKtuLJNirrfRRMeKTxtVo,4377
+omserv/server/multiprocess.py,sha256=jKmQzj_Nrwxw2mM-Tf3XVf6vPYMbfyCkPOUWVe028Q8,4253
 omserv/server/sockets.py,sha256=lwqNP7URlp605ibsjHzp0pc-lyjcyTu-hD-uyojLUYk,3389
 omserv/server/ssl.py,sha256=gmB5ecM8Mck-YtGYF8pb2dwFdjABVGzERFCDzM9lBck,1483
 omserv/server/taskspawner.py,sha256=ljzF26UPtnp7GLAY_BvjzuwCoCO9aL7TKLwRNTmUy1M,3008
@@ -46,8 +44,8 @@ omserv/server/streams/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 omserv/server/streams/httpstream.py,sha256=0DeiAPLGbEGNa0fHTs8lUpi_CFZs4M5_QB-TiS8mobQ,8015
 omserv/server/streams/utils.py,sha256=aMOrqWIg_Hht5W4kLg3y7oR5AEkVvMrZhyjzo6U5owE,1527
 omserv/server/streams/wsstream.py,sha256=3Vyzox7dCE1tDSXjb6xBubWo41ZF9d38Hrsrlj6h1J8,15482
-omserv-0.0.0.dev30.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omserv-0.0.0.dev30.dist-info/METADATA,sha256=zkqiC2MgnzdR1-F4oaUsLOdgX19obBj4O1_NMgKuutY,1003
-omserv-0.0.0.dev30.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omserv-0.0.0.dev30.dist-info/top_level.txt,sha256=HXehpnxeKscKNULzKNzZ27oNawBrsh1PaNAirbX-XNA,7
-omserv-0.0.0.dev30.dist-info/RECORD,,
+omserv-0.0.0.dev32.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omserv-0.0.0.dev32.dist-info/METADATA,sha256=NfCHbWwNOp5cdTjupmywRkTPR5C24A9dKWainMLjVQs,1003
+omserv-0.0.0.dev32.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omserv-0.0.0.dev32.dist-info/top_level.txt,sha256=HXehpnxeKscKNULzKNzZ27oNawBrsh1PaNAirbX-XNA,7
+omserv-0.0.0.dev32.dist-info/RECORD,,

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/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)