omlish 0.0.0.dev250__py3-none-any.whl → 0.0.0.dev252__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev250'
-__revision__ = '0e6e1316b474c6f882784e2474e809a478c54732'
+__version__ = '0.0.0.dev252'
+__revision__ = '7dc2af77cc02ef4529b3c5f8aeeee1c08886a806'
 
 
 #
@@ -32,7 +32,7 @@ class Project(ProjectBase):
 
     optional_dependencies = {
         'async': [
-            'anyio ~= 4.8',
+            'anyio ~= 4.9',
             'sniffio ~= 1.3',
 
             'greenlet ~= 3.1',

omlish/dispatch/impls.py

@@ -1,3 +1,10 @@
+"""
+TODO:
+ - generics? injected Manifests / type contexts?
+ - ta.Literal? support for simple scalars, enums
+ - multidispatch? never solved..
+  - just generic on tuple[A0, A1, ...]
+"""
 import contextlib
 import typing as ta
 import weakref

omlish/formats/json5/parsing.py

@@ -1,4 +1,4 @@
-# ruff: noqa: N802
+# ruff: noqa: N802 N803
 import typing as ta
 
 from omlish import antlr

omlish/lang/params.py

@@ -244,13 +244,13 @@ def param_render(
         render_default: ta.Callable[[ta.Any], str] | None = None,
 ) -> str:
     if isinstance(p, Param):
-        dfl_s: str | None = None
         ann_s: str | None = None
-        if isinstance(p, (VarParam, ValParam)) and p.annotation.present:
+        if p.annotation.present:
             if render_annotation is None:
                 raise ValueError(f'Param {p.name} has an annotation but no annotation renderer provided')
             ann_s = render_annotation(p.annotation.must())
 
+        dfl_s: str | None = None
         if isinstance(p, ValParam) and p.default.present:
             if render_default is None:
                 raise ValueError(f'Param {p.name} has a default but no default renderer provided')

omlish/lite/marshal.py

@@ -331,7 +331,7 @@ _DEFAULT_OBJ_MARSHALERS: ta.Dict[ta.Any, ObjMarshaler] = {
 
 _OBJ_MARSHALER_GENERIC_MAPPING_TYPES: ta.Dict[ta.Any, type] = {
     **{t: t for t in (dict,)},
-    **{t: dict for t in (collections.abc.Mapping, collections.abc.MutableMapping)},
+    **{t: dict for t in (collections.abc.Mapping, collections.abc.MutableMapping)},  # noqa
 }
 
 _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES: ta.Dict[ta.Any, type] = {

omlish/math/stats.py

@@ -191,7 +191,7 @@ class Stats(ta.Sequence[float]):
             # freedman algorithm for fixed-width bin selection
             q25, q75 = self.get_quantile(0.25), self.get_quantile(0.75)
             dx = 2 * (q75 - q25) / (len_data ** (1 / 3.0))
-            bin_count = max(1, int(math.ceil((max_data - min_data) / dx)))
+            bin_count = max(1, math.ceil((max_data - min_data) / dx))
             bins = [min_data + (dx * i) for i in range(bin_count + 1)]
             bins = [b for b in bins if b < max_data]
 
@@ -301,7 +301,7 @@ class SamplingHistogram:
 
     @staticmethod
     def _calc_percentile_pos(p: float, sz: int) -> int:
-        return int(round((p * sz) - 1))
+        return round((p * sz) - 1)
 
     def _calc_percentiles(self, entries: list[Entry | None]) -> list[Percentile]:
         entries = list(filter(None, entries))

omlish/specs/__init__.py

@@ -6,6 +6,4 @@ TODO:
  - jsonpatch
  - jsonpath
  - jsonpointer.py
- - protobuf
- - irc? or in net?
 """

omlish/specs/jsonrpc/types.py

@@ -81,6 +81,9 @@ def result(id: Id, result: ta.Any) -> Response:  # noqa
     return Response(id, result=result)
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 @msh.update_fields_metadata(['data'], omit_if=is_not_specified)
 class Error(lang.Final):

omlish/specs/proto/Protobuf3.g4

@@ -0,0 +1,396 @@
+/*
+https://github.com/antlr/grammars-v4/blob/f9b1c203dc6368d972bedcb6f8c3670688ad8008/protobuf3/Protobuf3.g4
+
+A Protocol Buffers 3 grammar for ANTLR v4.
+
+Derived and adapted from:
+https://developers.google.com/protocol-buffers/docs/reference/proto3-spec
+
+@author Marco Willemart
+*/
+grammar Protobuf3;
+
+
+proto
+    : syntax (syntaxExtra)* EOF
+    ;
+
+syntax
+    : SYNTAX '=' (PROTO3_DOUBLE | PROTO3_SINGLE) ';'
+    ;
+
+syntaxExtra
+    : importStmt
+    | packageStmt
+    | option
+    | topLevelDef
+    | emptyStmt
+    ;
+
+importStmt
+    : IMPORT (WEAK | PUBLIC)? STR_LIT ';'
+    ;
+
+packageStmt
+    : PACKAGE fullIdent ';'
+    ;
+
+option
+    : OPTION optionName '=' (constant | optionBody)  ';'
+    ;
+
+optionName
+    : (IDENT | '(' fullIdent ')') ('.' (IDENT | reservedWord))*
+    ;
+
+optionBody
+    : '{' (optionBodyVariable)* '}'
+    ;
+
+optionBodyVariable
+    : optionName ':' constant
+    ;
+
+topLevelDef
+    : message
+    | enumDef
+    | extend
+    | service
+    ;
+
+message
+    : MESSAGE messageName messageBody
+    ;
+
+messageBody
+    : '{' (messageBodyContent)* '}'
+    ;
+
+messageBodyContent
+    : field
+    | enumDef
+    | message
+    | extend
+    | option
+    | oneof
+    | mapField
+    | reserved
+    | emptyStmt
+    ;
+
+enumDef
+    : ENUM enumName enumBody
+    ;
+
+enumBody
+    : '{' (option | enumField | emptyStmt)* '}'
+    ;
+
+enumField
+    : IDENT '=' '-'? INT_LIT ('[' enumValueOption (','  enumValueOption)* ']')? ';'
+    ;
+
+enumValueOption
+    : optionName '=' constant
+    ;
+
+extend
+    : EXTEND messageType '{' (field | emptyStmt) '}'
+    ;
+
+service
+    : SERVICE serviceName '{' (option | rpc | emptyStmt)* '}'
+    ;
+
+rpc
+    : RPC rpcName '(' STREAM? messageType ')'
+      RETURNS '(' STREAM? messageType ')'
+      (('{' (option | emptyStmt)* '}') | ';')
+    ;
+
+reserved
+    : RESERVED (ranges | fieldNames) ';'
+    ;
+
+ranges
+    : rangeRule (',' rangeRule)*
+    ;
+
+rangeRule
+    : INT_LIT
+    | INT_LIT TO INT_LIT
+    ;
+
+fieldNames
+    : STR_LIT (',' STR_LIT)*
+    ;
+
+typeRule
+    : simpleType
+    | messageOrEnumType
+    ;
+
+simpleType
+    : DOUBLE
+    | FLOAT
+    | INT32
+    | INT64
+    | UINT32
+    | UINT64
+    | SINT32
+    | SINT64
+    | FIXED32
+    | FIXED64
+    | SFIXED32
+    | SFIXED64
+    | BOOL
+    | STRING
+    | BYTES
+    ;
+
+fieldNumber
+    : INT_LIT
+    ;
+
+field
+    : REPEATED? typeRule fieldName '=' fieldNumber ('[' fieldOptions ']')? ';'
+    ;
+
+fieldOptions
+    : fieldOption (','  fieldOption)*
+    ;
+
+fieldOption
+    : optionName '=' constant
+    ;
+
+oneof
+    : ONEOF oneofName '{' (oneofField | emptyStmt)* '}'
+    ;
+
+oneofField
+    : typeRule fieldName '=' fieldNumber ('[' fieldOptions ']')? ';'
+    ;
+
+mapField
+    : MAP '<' keyType ',' typeRule '>' mapName '=' fieldNumber ('[' fieldOptions ']')? ';'
+    ;
+
+keyType
+    : INT32
+    | INT64
+    | UINT32
+    | UINT64
+    | SINT32
+    | SINT64
+    | FIXED32
+    | FIXED64
+    | SFIXED32
+    | SFIXED64
+    | BOOL
+    | STRING
+    ;
+
+reservedWord
+    : EXTEND
+    | MESSAGE
+    | OPTION
+    | PACKAGE
+    | RPC
+    | SERVICE
+    | STREAM
+    | STRING
+    | SYNTAX
+    | WEAK
+    ;
+
+fullIdent
+    : IDENT ('.' IDENT)*
+    ;
+
+messageName
+    : IDENT
+    ;
+
+enumName
+    : IDENT
+    ;
+
+messageOrEnumName
+    : IDENT
+    ;
+
+fieldName
+    : IDENT
+    | reservedWord
+    ;
+
+oneofName
+    : IDENT
+    ;
+
+mapName
+    : IDENT
+    ;
+
+serviceName
+    : IDENT
+    ;
+
+rpcName
+    : IDENT
+    ;
+
+messageType
+    : '.'? (IDENT '.')* messageName
+    ;
+
+messageOrEnumType
+    : '.'? ((IDENT | reservedWord) '.')* messageOrEnumName
+    ;
+
+emptyStmt
+    : ';'
+    ;
+
+constant
+    : fullIdent
+    | ('-' | '+')? INT_LIT
+    | ('-' | '+')? FLOAT_LIT
+    | STR_LIT
+    | BOOL_LIT
+    ;
+
+BOOL: 'bool';
+BYTES: 'bytes';
+DOUBLE: 'double';
+ENUM: 'enum';
+EXTEND: 'extend';
+FIXED32: 'fixed32';
+FIXED64: 'fixed64';
+FLOAT: 'float';
+IMPORT: 'import';
+INT32: 'int32';
+INT64: 'int64';
+MAP: 'map';
+MESSAGE: 'message';
+ONEOF: 'oneof';
+OPTION: 'option';
+PACKAGE: 'package';
+PROTO3_DOUBLE: '"proto3"';
+PROTO3_SINGLE: '\'proto3\'';
+PUBLIC: 'public';
+REPEATED: 'repeated';
+RESERVED: 'reserved';
+RETURNS: 'returns';
+RPC: 'rpc';
+SERVICE: 'service';
+SFIXED32: 'sfixed32';
+SFIXED64: 'sfixed64';
+SINT32: 'sint32';
+SINT64: 'sint64';
+STREAM: 'stream';
+STRING: 'string';
+SYNTAX: 'syntax';
+TO: 'to';
+UINT32: 'uint32';
+UINT64: 'uint64';
+WEAK: 'weak';
+
+fragment LETTER
+    : [A-Za-z_]
+    ;
+
+fragment DECIMAL_DIGIT
+    : [0-9]
+    ;
+
+fragment OCTAL_DIGIT
+    : [0-7]
+    ;
+
+fragment HEX_DIGIT
+    : [0-9A-Fa-f]
+    ;
+
+IDENT
+    : LETTER (LETTER | DECIMAL_DIGIT)*
+    ;
+
+INT_LIT
+    : DECIMAL_LIT
+    | OCTAL_LIT
+    | HEX_LIT
+    ;
+
+fragment DECIMAL_LIT
+    : [1-9] DECIMAL_DIGIT*
+    ;
+
+fragment OCTAL_LIT
+    : '0' OCTAL_DIGIT*
+    ;
+
+fragment HEX_LIT
+    : '0' ('x' | 'X') HEX_DIGIT+
+    ;
+
+FLOAT_LIT
+    : (DECIMALS '.' DECIMALS? EXPONENT? | DECIMALS EXPONENT | '.' DECIMALS EXPONENT?)
+    | 'inf'
+    | 'nan'
+    ;
+
+fragment DECIMALS
+    : DECIMAL_DIGIT+
+    ;
+
+fragment EXPONENT
+    : ('e' | 'E') ('+' | '-')? DECIMALS
+    ;
+
+BOOL_LIT
+    : 'true'
+    | 'false'
+    ;
+
+STR_LIT
+    : '\'' CHAR_VALUE* '\''
+    | '"' CHAR_VALUE* '"'
+    ;
+
+fragment CHAR_VALUE
+    : HEX_ESCAPE
+    | OCT_ESCAPE
+    | CHAR_ESCAPE
+    | ~[\u0000\n\\]
+    ;
+
+fragment HEX_ESCAPE
+    : '\\' ('x' | 'X') HEX_DIGIT HEX_DIGIT
+    ;
+
+fragment OCT_ESCAPE
+    : '\\' OCTAL_DIGIT OCTAL_DIGIT OCTAL_DIGIT
+    ;
+
+fragment CHAR_ESCAPE
+    : '\\' [abfnrtv\\'"]
+    ;
+
+QUOTE
+    : '\''
+    | '"'
+    ;
+
+WS
+    : [ \t\r\n\u000C]+ -> channel(2)
+    ;
+
+COMMENT
+    : '/*' .*? '*/' -> channel(2)
+    ;
+
+LINE_COMMENT
+    : '//' ~[\r\n]* -> channel(2)
+    ;