omserv 0.0.0.dev188__tar.gz → 0.0.0.dev190__tar.gz

{omserv-0.0.0.dev188/omserv.egg-info → omserv-0.0.0.dev190}/PKG-INFO

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

{omserv-0.0.0.dev188 → omserv-0.0.0.dev190}/omserv/nginx/build.py

@@ -1,3 +1,7 @@
+"""
+TODO:
+ - https://github.com/webserver-llc/angie ?
+"""
 import multiprocessing as mp
 import os.path
 import shutil

omserv-0.0.0.dev190/omserv/nginx/configs.py

@@ -0,0 +1,76 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+"""
+TODO:
+ - omnibus/jmespath
+
+https://nginx.org/en/docs/dev/development_guide.html
+https://nginx.org/en/docs/dev/development_guide.html#config_directives
+https://nginx.org/en/docs/example.html
+
+https://github.com/yandex/gixy
+"""
+import collections.abc
+import dataclasses as dc
+import typing as ta
+
+from omlish.lite.check import check
+from omlish.text.indent import IndentWriter
+
+
+@dc.dataclass()
+class NginxConfigItems:
+    lst: ta.List['NginxConfigItem']
+
+    @classmethod
+    def of(cls, obj: ta.Any) -> 'NginxConfigItems':
+        if isinstance(obj, NginxConfigItems):
+            return obj
+        return cls([NginxConfigItem.of(e) for e in check.isinstance(obj, list)])
+
+
+@dc.dataclass()
+class NginxConfigItem:
+    name: str
+    args: ta.Optional[ta.List[str]] = None
+    block: ta.Optional[NginxConfigItems] = None
+
+    @classmethod
+    def of(cls, obj: ta.Any) -> 'NginxConfigItem':
+        if isinstance(obj, NginxConfigItem):
+            return obj
+        args = check.isinstance(check.not_isinstance(obj, str), collections.abc.Sequence)
+        name, args = check.isinstance(args[0], str), args[1:]
+        if args and not isinstance(args[-1], str):
+            block, args = NginxConfigItems.of(args[-1]), args[:-1]
+        else:
+            block = None
+        return NginxConfigItem(name, [check.isinstance(e, str) for e in args], block=block)
+
+
+def render_nginx_config(wr: IndentWriter, obj: ta.Any) -> None:
+    if isinstance(obj, NginxConfigItem):
+        wr.write(obj.name)
+        for e in obj.args or ():
+            wr.write(' ')
+            wr.write(e)
+        if obj.block:
+            wr.write(' {\n')
+            with wr.indent():
+                render_nginx_config(wr, obj.block)
+            wr.write('}\n')
+        else:
+            wr.write(';\n')
+
+    elif isinstance(obj, NginxConfigItems):
+        for e2 in obj.lst:
+            render_nginx_config(wr, e2)
+
+    else:
+        raise TypeError(obj)
+
+
+def render_nginx_config_str(obj: ta.Any) -> str:
+    iw = IndentWriter()
+    render_nginx_config(iw, obj)
+    return iw.getvalue()

{omserv-0.0.0.dev188 → omserv-0.0.0.dev190/omserv.egg-info}/PKG-INFO

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

{omserv-0.0.0.dev188 → omserv-0.0.0.dev190}/omserv.egg-info/SOURCES.txt

@@ -26,10 +26,10 @@ omserv/nginx/logs.py
 omserv/nginx/stubstatus.py
 omserv/nginx/patches/__init__.py
 omserv/nginx/patches/nginx-1.27.3_http_status.patch
-omserv/node/__init__.py
-omserv/node/models.py
-omserv/node/registry.py
-omserv/node/sql.py
+omserv/nodes/__init__.py
+omserv/nodes/models.py
+omserv/nodes/registry.py
+omserv/nodes/sql.py
 omserv/server/LICENSE
 omserv/server/__init__.py
 omserv/server/config.py

{omserv-0.0.0.dev188 → omserv-0.0.0.dev190}/omserv.egg-info/requires.txt

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

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

omserv-0.0.0.dev188/omserv/nginx/configs.py

@@ -1,86 +0,0 @@
-"""
-TODO:
- - omnibus/jmespath
-
-https://nginx.org/en/docs/dev/development_guide.html
-https://nginx.org/en/docs/dev/development_guide.html#config_directives
-https://nginx.org/en/docs/example.html
-
-https://github.com/yandex/gixy
-"""
-import dataclasses as dc
-import typing as ta
-
-from omlish import check
-from omlish import lang
-from omlish.text.indent import IndentWriter
-
-
-@dc.dataclass()
-class Items(lang.Final):
-    lst: list['Item']
-
-    @classmethod
-    def of(cls, obj: ta.Any) -> 'Items':
-        if isinstance(obj, Items):
-            return obj
-        return cls([Item.of(e) for e in check.isinstance(obj, list)])
-
-
-@dc.dataclass()
-class Item(lang.Final):
-    name: str
-    args: list[str] | None = None
-    block: Items | None = None
-
-    @classmethod
-    def of(cls, obj: ta.Any) -> 'Item':
-        if isinstance(obj, Item):
-            return obj
-        args = check.isinstance(obj, tuple)
-        name, args = check.isinstance(args[0], str), args[1:]
-        if args and not isinstance(args[-1], str):
-            block, args = Items.of(args[-1]), args[:-1]
-        else:
-            block = None
-        return Item(name, [check.isinstance(e, str) for e in args], block=block)
-
-
-def render(wr: IndentWriter, obj: ta.Any) -> None:
-    if isinstance(obj, Item):
-        wr.write(obj.name)
-        for e in obj.args or ():
-            wr.write(' ')
-            wr.write(e)
-        if obj.block:
-            wr.write(' {\n')
-            with wr.indent():
-                render(wr, obj.block)
-            wr.write('}\n')
-        else:
-            wr.write(';\n')
-
-    elif isinstance(obj, Items):
-        for e2 in obj.lst:
-            render(wr, e2)
-
-    else:
-        raise TypeError(obj)
-
-
-def _main() -> None:
-    conf = Items.of([
-        ('user', 'www', 'www'),
-        ('worker_processes', '2'),
-        ('events', [
-            ('worker_connections', '2000'),
-        ]),
-    ])
-
-    wr = IndentWriter()
-    render(wr, conf)
-    print(wr.getvalue())
-
-
-if __name__ == '__main__':
-    _main()