omserv 0.0.0.dev188__py3-none-any.whl → 0.0.0.dev190__py3-none-any.whl

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/nginx/configs.py

@@ -1,3 +1,5 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
 """
 TODO:
  - omnibus/jmespath
@@ -8,46 +10,46 @@ 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 import check
-from omlish import lang
+from omlish.lite.check import check
 from omlish.text.indent import IndentWriter
 
 
 @dc.dataclass()
-class Items(lang.Final):
-    lst: list['Item']
+class NginxConfigItems:
+    lst: ta.List['NginxConfigItem']
 
     @classmethod
-    def of(cls, obj: ta.Any) -> 'Items':
-        if isinstance(obj, Items):
+    def of(cls, obj: ta.Any) -> 'NginxConfigItems':
+        if isinstance(obj, NginxConfigItems):
             return obj
-        return cls([Item.of(e) for e in check.isinstance(obj, list)])
+        return cls([NginxConfigItem.of(e) for e in check.isinstance(obj, list)])
 
 
 @dc.dataclass()
-class Item(lang.Final):
+class NginxConfigItem:
     name: str
-    args: list[str] | None = None
-    block: Items | None = None
+    args: ta.Optional[ta.List[str]] = None
+    block: ta.Optional[NginxConfigItems] = None
 
     @classmethod
-    def of(cls, obj: ta.Any) -> 'Item':
-        if isinstance(obj, Item):
+    def of(cls, obj: ta.Any) -> 'NginxConfigItem':
+        if isinstance(obj, NginxConfigItem):
             return obj
-        args = check.isinstance(obj, tuple)
+        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 = Items.of(args[-1]), args[:-1]
+            block, args = NginxConfigItems.of(args[-1]), args[:-1]
         else:
             block = None
-        return Item(name, [check.isinstance(e, str) for e in args], block=block)
+        return NginxConfigItem(name, [check.isinstance(e, str) for e in args], block=block)
 
 
-def render(wr: IndentWriter, obj: ta.Any) -> None:
-    if isinstance(obj, Item):
+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(' ')
@@ -55,32 +57,20 @@ def render(wr: IndentWriter, obj: ta.Any) -> None:
         if obj.block:
             wr.write(' {\n')
             with wr.indent():
-                render(wr, obj.block)
+                render_nginx_config(wr, obj.block)
             wr.write('}\n')
         else:
             wr.write(';\n')
 
-    elif isinstance(obj, Items):
+    elif isinstance(obj, NginxConfigItems):
         for e2 in obj.lst:
-            render(wr, e2)
+            render_nginx_config(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()
+def render_nginx_config_str(obj: ta.Any) -> str:
+    iw = IndentWriter()
+    render_nginx_config(iw, obj)
+    return iw.getvalue()

{omserv-0.0.0.dev188.dist-info → omserv-0.0.0.dev190.dist-info}/METADATA

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

@@ -10,16 +10,16 @@ omserv/apps/sessions.py,sha256=glruQSbOSbCYLPp6nDRNSHCyp5hj4oiOPhh3R0F9BTM,1537
 omserv/apps/templates.py,sha256=PBRZHIF9UbnFnq-4EC6RmPeRkeH8lCBbpJkSdseHs6A,2125
 omserv/daemon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omserv/nginx/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omserv/nginx/build.py,sha256=GdDOB3_yLIBKsm6DDcCv7FfajB5-G7x75JcFOgW9CVM,3145
-omserv/nginx/configs.py,sha256=4oQDcKJKIatRG621qiZCYTayJI3-vv63TtRCiUxEVWI,2008
+omserv/nginx/build.py,sha256=2LzI5eM3U2V0CbUHEOHx4zwnMl5CU2lhu-odPrI7idU,3203
+omserv/nginx/configs.py,sha256=cOCz3_QxkZfS5j_zQBQNeDWdMjv8CWGB8YqEZ2FL7tI,2106
 omserv/nginx/logs.py,sha256=cODPsG1j3EQiXbb9SR20NpB9MjGdWN0ArFZ-TA9xf-c,1840
 omserv/nginx/stubstatus.py,sha256=_VnXZdXxSA7jIelYSwJLf9mOnt_UOvpWghAPWtlWSLw,1857
 omserv/nginx/patches/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omserv/nginx/patches/nginx-1.27.3_http_status.patch,sha256=bEDSczpBLcdjcBp_X1m73oxvt8KPeons7v_sUxqBSXM,4335
-omserv/node/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omserv/node/models.py,sha256=EOaq-aW1rbGOzHTmTULhbVwV5j_burL07qh2QO9smdM,1273
-omserv/node/registry.py,sha256=y67VMowll9IuLiTVgauAcbP8-evFJNqpwocwwt7kZL4,3478
-omserv/node/sql.py,sha256=vy7RP50JiH3jQHMVa7Hxk0pFJK3QcbGeTvyNppB1W4I,2826
+omserv/nodes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omserv/nodes/models.py,sha256=EOaq-aW1rbGOzHTmTULhbVwV5j_burL07qh2QO9smdM,1273
+omserv/nodes/registry.py,sha256=y67VMowll9IuLiTVgauAcbP8-evFJNqpwocwwt7kZL4,3478
+omserv/nodes/sql.py,sha256=vy7RP50JiH3jQHMVa7Hxk0pFJK3QcbGeTvyNppB1W4I,2826
 omserv/server/LICENSE,sha256=VKPNmbyrS9wcwcx20hBlVtLP01brb2dByHrWHeNLPag,1050
 omserv/server/__init__.py,sha256=jrFdrxfnQwjK5DW5y9w0alw6IKToGn2IQyZDhsuGHv4,372
 omserv/server/config.py,sha256=oGWL1kuk45bJ6sVr8n3ow5Q-1nz9EqByjoykU2iOHIY,1189
@@ -48,9 +48,9 @@ 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.dev188.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omserv-0.0.0.dev188.dist-info/METADATA,sha256=iWG_OtaRtoDnt8Jn5AHfMkExr6RhgT7cSDOJJLBVf6A,983
-omserv-0.0.0.dev188.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-omserv-0.0.0.dev188.dist-info/entry_points.txt,sha256=ivSrdA_ahEbI-eVMu-XZS-z4VrnQISvpecIkOqC9zFM,35
-omserv-0.0.0.dev188.dist-info/top_level.txt,sha256=HXehpnxeKscKNULzKNzZ27oNawBrsh1PaNAirbX-XNA,7
-omserv-0.0.0.dev188.dist-info/RECORD,,
+omserv-0.0.0.dev190.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omserv-0.0.0.dev190.dist-info/METADATA,sha256=tjpmp09_W5LMbCxvv0MhB4OapPnhXlYClZ4JVSl7Bxo,983
+omserv-0.0.0.dev190.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+omserv-0.0.0.dev190.dist-info/entry_points.txt,sha256=ivSrdA_ahEbI-eVMu-XZS-z4VrnQISvpecIkOqC9zFM,35
+omserv-0.0.0.dev190.dist-info/top_level.txt,sha256=HXehpnxeKscKNULzKNzZ27oNawBrsh1PaNAirbX-XNA,7
+omserv-0.0.0.dev190.dist-info/RECORD,,