omserv 0.0.0.dev29__tar.gz → 0.0.0.dev31__tar.gz

{omserv-0.0.0.dev29/omserv.egg-info → omserv-0.0.0.dev31}/PKG-INFO

@@ -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 → omserv-0.0.0.dev31}/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-0.0.0.dev29 → omserv-0.0.0.dev31}/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-0.0.0.dev29 → omserv-0.0.0.dev31}/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 → omserv-0.0.0.dev31/omserv.egg-info}/PKG-INFO

@@ -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 → omserv-0.0.0.dev31}/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.dev29 → omserv-0.0.0.dev31}/omserv.egg-info/requires.txt

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

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

omserv-0.0.0.dev29/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.dev29/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)