omserv 0.0.0.dev29__py3-none-any.whl → 0.0.0.dev31__py3-none-any.whl

omserv/node/models.py

@@ -4,7 +4,7 @@ import sqlalchemy as sa
 import sqlalchemy.dialects.postgresql as sapg
 import sqlalchemy.orm
 
-from omlish import sql
+from omlish.sql import alchemy as sau
 
 from .sql import CREATE_UPDATED_AT_FUNCTION_STATEMENT
 from .sql import IdMixin
@@ -43,9 +43,9 @@ Nodes = Node.__table__
 install_updated_at_trigger(Metadata, 'nodes')
 
 
-async def setup_db(engine: sql.AsyncEngineLike, *, drop: bool = False) -> None:
-    conn: sql.AsyncConnection
-    async with sql.async_adapt(engine).connect() as conn:
+async def setup_db(engine: sau.AsyncEngineLike, *, drop: bool = False) -> None:
+    conn: sau.AsyncConnection
+    async with sau.async_adapt(engine).connect() as conn:
         async with conn.begin():
             if drop:
                 await conn.run_sync(Metadata.drop_all)

omserv/node/registry.py

@@ -11,8 +11,8 @@ import sqlalchemy as sa
 from omlish import asyncs as au
 from omlish import check
 from omlish import lang
-from omlish import sql
 from omlish.asyncs import anyio as anu
+from omlish.sql import alchemy as sau
 
 from .models import Nodes
 from .models import setup_db
@@ -38,13 +38,13 @@ ExtrasProvider = ta.NewType('ExtrasProvider', lang.Func0[ta.Awaitable[ta.Any]])
 class NodeRegistrant:
     def __init__(
             self,
-            engine: sql.AsyncEngine,
+            engine: sau.AsyncEngine,
             *,
             extras: ta.Mapping[str, ExtrasProvider] | None = None,
     ) -> None:
         super().__init__()
 
-        self._engine = check.isinstance(engine, sql.AsyncEngine)
+        self._engine = check.isinstance(engine, sau.AsyncEngine)
         self._extras = extras
 
         self._info = NodeInfo(
@@ -74,7 +74,7 @@ class NodeRegistrant:
         await self._update_info()
 
         async with contextlib.AsyncExitStack() as aes:
-            conn: sql.AsyncConnection = await aes.enter_async_context(self._engine.connect())  # noqa
+            conn: sau.AsyncConnection = await aes.enter_async_context(self._engine.connect())  # noqa
 
             async with conn.begin():
                 rows = (await conn.execute(

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

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

{omserv-0.0.0.dev29.dist-info → omserv-0.0.0.dev31.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
@@ -17,11 +15,11 @@ omserv/nginx/stubstatus.py,sha256=_VnXZdXxSA7jIelYSwJLf9mOnt_UOvpWghAPWtlWSLw,18
 omserv/nginx/patches/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omserv/nginx/patches/nginx-1.27.1_http_status.patch,sha256=bEDSczpBLcdjcBp_X1m73oxvt8KPeons7v_sUxqBSXM,4335
 omserv/node/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omserv/node/models.py,sha256=XsfAI-LjlRkRfK0_ofh-gai5IUq_g357UfThK9dZ0UM,1258
-omserv/node/registry.py,sha256=0hodmyQn3POOZJBG8zTr9ojR80-ZNmIwJpQbchJg8EM,3459
+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
@@ -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.dev29.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omserv-0.0.0.dev29.dist-info/METADATA,sha256=e030SrUeCat2kciwk03zPlc_USubI2XUd7LumCKdW7s,1003
-omserv-0.0.0.dev29.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omserv-0.0.0.dev29.dist-info/top_level.txt,sha256=HXehpnxeKscKNULzKNzZ27oNawBrsh1PaNAirbX-XNA,7
-omserv-0.0.0.dev29.dist-info/RECORD,,
+omserv-0.0.0.dev31.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omserv-0.0.0.dev31.dist-info/METADATA,sha256=h1W3vmhDqDSNvMf5QwfeZrrUjq9QYMO65118DvdWM20,1003
+omserv-0.0.0.dev31.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omserv-0.0.0.dev31.dist-info/top_level.txt,sha256=HXehpnxeKscKNULzKNzZ27oNawBrsh1PaNAirbX-XNA,7
+omserv-0.0.0.dev31.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)