omlish 0.0.0.dev87__tar.gz → 0.0.0.dev88__tar.gz

{omlish-0.0.0.dev87/omlish.egg-info → omlish-0.0.0.dev88}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev87
+Version: 0.0.0.dev88
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev87 → omlish-0.0.0.dev88}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev87'
-__revision__ = '116137c4ae1e4aaf7ffb66a2847d4a38d6cce73e'
+__version__ = '0.0.0.dev88'
+__revision__ = 'ccf0f3b0ac6cc9e9ca522c8c4a9c8e6a4151bd7b'
 
 
 #

{omlish-0.0.0.dev87 → omlish-0.0.0.dev88}/omlish/formats/json/cli/cli.py

@@ -168,10 +168,9 @@ def _main() -> None:
                 else:
                     renderer = StreamJsonRenderer(
                         out,
-                        StreamJsonRenderer.Options(
-                            **kw,
-                            style=term_color if args.color else None,
-                        ),
+                        style=term_color if args.color else None,
+                        delimiter='\n',
+                        **kw,
                     )
                     build = None
 
@@ -198,7 +197,8 @@ def _main() -> None:
                     if not buf:
                         break
 
-                out.write('\n')
+                if renderer is not None:
+                    out.write('\n')
 
         else:
             with io.TextIOWrapper(in_file) as tw:

{omlish-0.0.0.dev87 → omlish-0.0.0.dev88}/omlish/formats/json/render.py

@@ -1,5 +1,4 @@
 import abc
-import dataclasses as dc
 import enum
 import io
 import json
@@ -20,35 +19,32 @@ class AbstractJsonRenderer(lang.Abstract, ta.Generic[I]):
         VALUE = enum.auto()
         KEY = enum.auto()
 
-    @dc.dataclass(frozen=True, kw_only=True)
-    class Options:
-        indent: int | str | None = None
-        separators: tuple[str, str] | None = None
-        sort_keys: bool = False
-        style: ta.Callable[[ta.Any, 'AbstractJsonRenderer.State'], tuple[str, str]] | None = None
-
     def __init__(
             self,
             out: JsonRendererOut,
-            opts: Options = Options(),
+            *,
+            indent: int | str | None = None,
+            separators: tuple[str, str] | None = None,
+            sort_keys: bool = False,
+            style: ta.Callable[[ta.Any, State], tuple[str, str]] | None = None,
     ) -> None:
         super().__init__()
 
         self._out = out
-        self._opts = opts
+        self._sort_keys = sort_keys
+        self._style = style
 
-        separators = opts.separators
-        if isinstance(opts.indent, (str, int)):
-            self._indent = (' ' * opts.indent) if isinstance(opts.indent, int) else opts.indent
+        if isinstance(indent, (str, int)):
+            self._indent = (' ' * indent) if isinstance(indent, int) else indent
             self._endl = '\n'
             if separators is None:
                 separators = (',', ': ')
-        elif opts.indent is None:
+        elif indent is None:
             self._indent = self._endl = ''
             if separators is None:
                 separators = (', ', ': ')
         else:
-            raise TypeError(opts.indent)
+            raise TypeError(indent)
         self._comma, self._colon = separators
 
         self._level = 0
@@ -76,7 +72,7 @@ class AbstractJsonRenderer(lang.Abstract, ta.Generic[I]):
     @classmethod
     def render_str(cls, i: I, **kwargs: ta.Any) -> str:
         out = io.StringIO()
-        cls(out, cls.Options(**kwargs)).render(i)
+        cls(out, **kwargs).render(i)
         return out.getvalue()
 
 
@@ -86,8 +82,8 @@ class JsonRenderer(AbstractJsonRenderer[ta.Any]):
             o: ta.Any,
             state: AbstractJsonRenderer.State = AbstractJsonRenderer.State.VALUE,
     ) -> None:
-        if self._opts.style is not None:
-            pre, post = self._opts.style(o, state)
+        if self._style is not None:
+            pre, post = self._style(o, state)
             self._write(pre)
         else:
             post = None
@@ -102,7 +98,7 @@ class JsonRenderer(AbstractJsonRenderer[ta.Any]):
             self._write('{')
             self._level += 1
             items = list(o.items())
-            if self._opts.sort_keys:
+            if self._sort_keys:
                 items.sort(key=lambda t: t[0])
             for i, (k, v) in enumerate(items):
                 if i:

{omlish-0.0.0.dev87 → omlish-0.0.0.dev88}/omlish/formats/json/stream/lex.py

@@ -94,7 +94,7 @@ CONST_TOKENS: ta.Mapping[str, tuple[TokenKind, str | float | None]] = {
 ##
 
 
-@dc.dataclass(frozen=True)
+@dc.dataclass()
 class JsonLexError(Exception):
     message: str
 

{omlish-0.0.0.dev87 → omlish-0.0.0.dev88}/omlish/formats/json/stream/render.py

@@ -3,7 +3,6 @@ import typing as ta
 
 from ..render import AbstractJsonRenderer
 from ..render import JsonRendererOut
-from .build import JsonObjectBuilder
 from .parse import BeginArray
 from .parse import BeginObject
 from .parse import EndArray
@@ -19,23 +18,28 @@ class StreamJsonRenderer(AbstractJsonRenderer[ta.Iterable[JsonStreamParserEvent]
     def __init__(
             self,
             out: JsonRendererOut,
-            opts: AbstractJsonRenderer.Options = AbstractJsonRenderer.Options(),
+            *,
+            delimiter: str = '',
+            sort_keys: bool = False,
+            **kwargs: ta.Any,
     ) -> None:
-        if opts.sort_keys:
+        if sort_keys:
             raise TypeError('Not yet implemented')
 
-        super().__init__(out, opts)
+        self._delimiter = delimiter
+
+        super().__init__(out, **kwargs)
 
         self._stack: list[tuple[ta.Literal['OBJECT', 'ARRAY'], int]] = []
-        self._builder: JsonObjectBuilder | None = None
+        self._need_delimit = False
 
     def _render_value(
             self,
             o: ta.Any,
             state: AbstractJsonRenderer.State = AbstractJsonRenderer.State.VALUE,
     ) -> None:
-        if self._opts.style is not None:
-            pre, post = self._opts.style(o, state)
+        if self._style is not None:
+            pre, post = self._style(o, state)
             self._write(pre)
         else:
             post = None
@@ -53,6 +57,10 @@ class StreamJsonRenderer(AbstractJsonRenderer[ta.Iterable[JsonStreamParserEvent]
             self._write(post)
 
     def _render(self, e: JsonStreamParserEvent) -> None:
+        if self._need_delimit:
+            self._write(self._delimiter)
+            self._need_delimit = False
+
         if e != EndArray and self._stack and (tt := self._stack[-1])[0] == 'ARRAY':
             if tt[1]:
                 self._write(self._comma)
@@ -64,6 +72,8 @@ class StreamJsonRenderer(AbstractJsonRenderer[ta.Iterable[JsonStreamParserEvent]
 
         if e is None or isinstance(e, (str, int, float, bool)):
             self._render_value(e)
+            if not self._stack:
+                self._need_delimit = True
 
         #
 
@@ -92,6 +102,8 @@ class StreamJsonRenderer(AbstractJsonRenderer[ta.Iterable[JsonStreamParserEvent]
             if tt[1]:
                 self._write_indent()
             self._write('}')
+            if not self._stack:
+                self._need_delimit = True
 
         #
 
@@ -108,6 +120,8 @@ class StreamJsonRenderer(AbstractJsonRenderer[ta.Iterable[JsonStreamParserEvent]
             if tt[1]:
                 self._write_indent()
             self._write(']')
+            if not self._stack:
+                self._need_delimit = True
 
         #
 

{omlish-0.0.0.dev87 → omlish-0.0.0.dev88}/omlish/sql/dbapi.py

@@ -69,6 +69,10 @@ class DbapiDriver:
 
 
 class DbapiDrivers(lang.Namespace):
+
+    ##
+    # sqlite
+
     SQLITE3 = DbapiDriver(
         name='sqlite3',
         dialect=DbapiDialect.SQLITE,
@@ -88,7 +92,8 @@ class DbapiDrivers(lang.Namespace):
         param_style=ParamStyle.QMARK,
     )
 
-    #
+    ##
+    # mysql
 
     PYMYSQL = DbapiDriver(
         name='pymysql',
@@ -112,7 +117,8 @@ class DbapiDrivers(lang.Namespace):
         module_name='MySQLdb',
     )
 
-    #
+    ##
+    # postgres
 
     PG8000 = DbapiDriver(
         name='pg8000',
@@ -132,7 +138,8 @@ class DbapiDrivers(lang.Namespace):
         param_style=ParamStyle.PYFORMAT,
     )
 
-    #
+    ##
+    # snowflake
 
     SNOWFLAKE = DbapiDriver(
         name='snowflake',

{omlish-0.0.0.dev87 → omlish-0.0.0.dev88}/omlish/sql/queries/inserts.py

@@ -18,11 +18,11 @@ from .stmts import Stmt
 
 
 class Values(dc.Frozen, lang.Final):
-    vs: ta.Sequence[Expr]
+    vs: ta.Sequence[Expr] = dc.xfield(coerce=tuple)
 
 
 class Insert(Stmt, lang.Final):
-    columns: ta.Sequence[Ident]
+    columns: ta.Sequence[Ident] = dc.xfield(coerce=tuple)
     into: Relation
     data: Values | Select
 

{omlish-0.0.0.dev87 → omlish-0.0.0.dev88}/omlish/sql/queries/selects.py

@@ -44,7 +44,7 @@ class SelectBuilder(ExprBuilder, RelationBuilder):
             where: CanExpr | None = None,
     ) -> Select:
         return Select(
-            [self.select_item(i) for i in items],
+            tuple(self.select_item(i) for i in items),
             from_=self.relation(from_) if from_ is not None else None,
             where=self.expr(where) if where is not None else None,
         )

{omlish-0.0.0.dev87 → omlish-0.0.0.dev88/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev87
+Version: 0.0.0.dev88
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev87 → omlish-0.0.0.dev88}/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.dev87'
+version = '0.0.0.dev88'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',