ab_engine 0.2.4__tar.gz → 0.2.6__tar.gz

{ab_engine-0.2.4 → ab_engine-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ab_engine
-Version: 0.2.4
+Version: 0.2.6
 Summary: Library of standard modules
 Author-email: Andrew Bulatov <BulatovAndrew@gmail.com>
 License-Expression: MIT

{ab_engine-0.2.4 → ab_engine-0.2.6}/ab_engine/db/driver.py

@@ -165,7 +165,8 @@ class Driver(ABC):
                 return reencode(var)
             else:
                 var = ','.join(['NULL' if x is None else in_arr_str(x) for x in var])
-                return reencode(f"{{{var.replace("'", "''")}}}")
+                var = var.replace("'", "''")
+                return reencode(f"{{{var}}}")
         elif isinstance(var, set):
             var = ','.join('NULL' if x is None else in_arr_str(x) for x in var)
             return reencode(f"{{{var}}}")

{ab_engine-0.2.4 → ab_engine-0.2.6}/ab_engine/env/config.py

@@ -3,7 +3,10 @@ from datetime import datetime
 from json import dumps, loads
 from json5 import loads as json5_load
 from yaml import safe_load as yaml_load
-from tomllib import loads as toml_load
+try:
+    from tomllib import loads as toml_load
+except:
+    toml_load = None
 from pathlib import Path
 from os import environ as ENV
 import logging as LOG
@@ -123,6 +126,8 @@ class Config:
                 case ".yaml" | ".yml":
                     return yaml_load(data)
                 case ".toml":
+                    if toml_load is None:
+                        raise error("BAD_FORMAT", format_name=fn)
                     return toml_load(data)
                 case _:
                     raise error("BAD_FORMAT", format_name=fn)

{ab_engine-0.2.4 → ab_engine-0.2.6}/ab_engine/error.yaml

@@ -39,6 +39,8 @@
   class: RuntimeError
   msg: ключ не может содержать знаков операций, открывающих круглых скобок и пробелов {key}
 ### Ошибки JsonRPC
+- code: -32000
+  msg: Ошибка сервера # Server error -32000 to -32099 Reserved for implementation-defined server-errors.
 - code: -32700
   msg: Ошибка разбора сообщения # "Parse error"
 - code: -32600

{ab_engine-0.2.4 → ab_engine-0.2.6}/ab_engine/rpc/json_rpc.py

@@ -11,12 +11,11 @@ class JSON_RPC:
 
     @staticmethod
     def rpc_error(code, data=None, header=None):
-
+        if not isinstance(code, int) or code > -32000 or code < -32099:
+            code = -32000
         err = error_msg(code)
         if err.message is None:
-            err.message = "Server error (UNKNOWN!!)"
-            if not isinstance(code, int) or code > -32000 or code < -32099:
-                code = -32000
+            err.message = "Server error"
             err.code = code
         code = {
             "code": err.code,
@@ -74,8 +73,10 @@ class JSON_RPC:
             if "id" in message:
                 res["id"] = message["id"]
         except Exception as e:
-            Config().log_level
-            res = self.rpc_error(-32000, data=e, header=message)
+            if Config().log_level.value > LogLevel.DEBUG.value:
+                res = self.rpc_error(-32000, header=message)
+            else:
+                res = self.rpc_error(-32000, data=e, header=message)
         if res.get("error") is not None:
             self.log(f"{f}: ERROR:\n{res['error']}!!")
             if env.in_transaction:

{ab_engine-0.2.4 → ab_engine-0.2.6}/ab_engine/rpc/rpc.py

@@ -250,7 +250,7 @@ def register_list(defs:list | dict, self=None)->None:
         else:
             match fnc.get("type", "db"):
                 case "db":
-                    SqlFnc(x, f"{r'\JSON'} {fnc['function']}(JSONB)", help=fnc.get('help'))
+                    SqlFnc(x, f"\\JSON {fnc['function']}(JSONB)", help=fnc.get('help'))
                 case "self":
                     fn = getattr(self, fnc['function'])
                     PythonFnc(x, fn, help = fnc.get('help') )

{ab_engine-0.2.4 → ab_engine-0.2.6}/ab_engine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ab_engine
-Version: 0.2.4
+Version: 0.2.6
 Summary: Library of standard modules
 Author-email: Andrew Bulatov <BulatovAndrew@gmail.com>
 License-Expression: MIT

{ab_engine-0.2.4 → ab_engine-0.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ab_engine"
-version = "0.2.4"
+version = "0.2.6"
 description = "Library of standard modules"
 authors = [{name = "Andrew Bulatov", email = "BulatovAndrew@gmail.com"}]
 license = "MIT"