ab_engine 0.2.3__tar.gz → 0.2.5__tar.gz

{ab_engine-0.2.3 → ab_engine-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ab_engine
-Version: 0.2.3
+Version: 0.2.5
 Summary: Library of standard modules
 Author-email: Andrew Bulatov <BulatovAndrew@gmail.com>
 License-Expression: MIT
@@ -10,7 +10,6 @@ Description-Content-Type: text/markdown
 Requires-Dist: json5>=0.12.0
 Requires-Dist: psycopg>=3.2.9
 Requires-Dist: pyyaml>=6.0.3
-Requires-Dist: toml>=0.10.2
 
 Библиотека стандартных модулей
 ==========================================================

{ab_engine-0.2.3 → ab_engine-0.2.5}/ab_engine/class_tools.py

@@ -41,19 +41,17 @@ class ReadOnlyPropDict:
 
     def __init__(self,  **kwargs):
         self._data = kwargs
-        for x in kwargs:
-            self._set_f(x)
-
-    def _set_f(self, x):
-        setattr(self.__class__, x, property(lambda p: self._data[x]))
 
     def __getitem__(self, item):
         return self._data[item]
 
+    def __getattr__(self, item):
+        return self._data[item]
+
 
 class PropDict(ReadOnlyPropDict):
 
-    def _set_f(self, x):
-        def set_f(p, v):
-            self._data[x] = v
-        setattr(self.__class__, x, property(lambda p: self._data[x], set_f))
+    def __setattr__(self, name, value):
+        if name not in self._data:
+            raise KeyError(name)
+        self._data[name] = value

{ab_engine-0.2.3 → ab_engine-0.2.5}/ab_engine/db/driver.py

@@ -1,11 +1,12 @@
 from enum import Enum
 from json import dumps
-from datetime import datetime, time
 from abc import ABC, abstractmethod
 from collections import namedtuple
 from typing import Optional
 from urllib.parse import unquote
 from inspect import iscoroutinefunction
+from uuid import UUID
+import datetime, uuid
 
 _is_option = None
 
@@ -32,6 +33,17 @@ def reencode(s):
     return s
 
 
+def in_arr_str(s):
+    if not isinstance(s, str):
+        return str(s)
+    s = s.replace('"','\\"')
+    as_is = True
+    for x in s:
+        if x in '{} ,"\\;':
+            as_is = False
+            break
+    return s if as_is else f'"{s}"'
+
 class Driver(ABC):
 
     LIKE = "LIKE" # что использовать как like, например для postgresql это ILIKE
@@ -142,6 +154,8 @@ class Driver(ABC):
     def var_to_sql(var, str_after=" "):
         if var is None:
             return " NULL"
+        elif isinstance(var, (int, float, bool)):
+            return f" {var}"
         elif isinstance(var, str):
             var = var.replace("'", "''")
             return reencode(var)
@@ -150,15 +164,15 @@ class Driver(ABC):
                 var = dumps(var, ensure_ascii=False).replace("'", "''")
                 return reencode(var)
             else:
-                var = ','.join(['NULL' if x is None else str(x) for x in var])
-                return reencode(f"{{{var}}}")
+                var = ','.join(['NULL' if x is None else in_arr_str(x) for x in var])
+                return reencode(f"{{{var.replace("'", "''")}}}")
         elif isinstance(var, set):
-            var = ','.join('NULL' if x is None else str(x) for x in var)
+            var = ','.join('NULL' if x is None else in_arr_str(x) for x in var)
             return reencode(f"{{{var}}}")
         elif isinstance(var, dict):
             var = dumps(var, ensure_ascii=False).replace("'", "''")
             return reencode(var)
-        elif isinstance(var, (datetime, time)):
+        elif hasattr(datetime, var.__class__.__name__) or isinstance(var, UUID):
             return f" '{var}'"
         else:
             return f" {var}"

{ab_engine-0.2.3 → ab_engine-0.2.5}/ab_engine/db/option.py

@@ -113,6 +113,7 @@ class DB(Option):
                     self._params[x.replace("$",".")] = v
         else:
             self._params = {}
+        self._hash = hash(connection_string)
         if "://" not in connection_string:
             try:
                 _check_cfg()
@@ -155,14 +156,10 @@ class DB(Option):
         else:
             driver_path = ""
 
-        self._hash = hash(driver_path + connection_string)
         if "LIMIT" in self._params:
             m = self._params["LIMIT"]
             del self._params["LIMIT"]
-        else:
-            m = 0
-        self._conn_limit = None
-        self.connection_limit = m
+            self.connection_limit = m
         self._connection = driver(connection_string, self._on_open_close, notify)
 
     @property
@@ -192,21 +189,18 @@ class DB(Option):
         else:
             lmt = BoundedSemaphore(value)
             _LIMITS_[self._hash] = lmt
-        self._conn_limit = lmt
 
 
     async def _on_open_close(self, close=False)->dict:
-        if self._conn_limit:
+        if lmt:=_LIMITS_.get(self._hash):
             if close:
-                await self._conn_limit.release()
-                if self._hash not in _LIMITS_:
-                    self._conn_limit = None
-            elif self._hash not in _LIMITS_:
-                self._conn_limit = None
+                lmt.release()
             else:
-                if self._conn_limit.locked():
+                if lmt.locked():
                     await self.garbage_collect()
-                await self._conn_limit.acquire()
+                    while lmt.locked():
+                        await sleep(0.0001)
+                await lmt.acquire()
         return self._params
 
     @property

{ab_engine-0.2.3 → ab_engine-0.2.5}/ab_engine/db/table.py

@@ -4,22 +4,6 @@ from ..error import raise_error
 from .processor import sql
 import asyncio
 
-
-class ROW(ReadOnlyPropDict):
-
-    def __str__(self):
-        s = ""
-        for x in self._data:
-            v = str(self._data[x].value).replace("\t","    ")
-            s += f" {x}: {v}" + "\t"
-        return s[:-1]
-
-    def __getitem__(self, item):
-        if item not in self._data:
-            raise_error("FIELD_NOT_FOUND", name=item)
-        return self._data[item]
-
-
 class Field:
 
     class _Condition:
@@ -42,7 +26,8 @@ class Field:
             if isinstance(right, Field):
                 if right._table == left._table:
                     right = Field._Condition.Name(right.name)
-                right = right.value
+                else:
+                    right = right.value
             if not isinstance(left, Field):
                 raise_error("NOT_LFIELD")
             elif op in ("%", "//"):
@@ -222,6 +207,20 @@ class Table:
     class _FILTER(ALL):
         ...
 
+    class ROW(ReadOnlyPropDict):
+
+        def __str__(self):
+            s = ""
+            for x in self._data:
+                v = str(self._data[x].value).replace("\t","    ")
+                s += f" {x}: {v}" + "\t"
+            return s[:-1]
+
+        def __getitem__(self, item):
+            if item not in self._data:
+                raise_error("FIELD_NOT_FOUND", name=item)
+            return self._data[item]
+
     def __init__(self, table_struct:dict, db:DB, page_size=100, auto_close_conn=True, async_delay=0.001):
         self._table = table_struct["table"]
         self._db = db
@@ -233,7 +232,7 @@ class Table:
         self._offset = 0
         self._page = None
         self._filter = ""
-        self._row = ROW(**{x["name"]:Field(x, self) for x in table_struct.get("fields", [])})
+        self._row = Table.ROW(**{x["name"]:Field(x, self) for x in table_struct.get("fields", [])})
         self._key = 1
         constraint = table_struct.get("constraints")
         for x in  constraint:
@@ -329,7 +328,6 @@ class Table:
         """строка, на которой стоит курсор (счет с 0)"""
         return self._offset + (self._ptr or 0)
 
-
     async def seek(self, *args, **kwargs):
         if kwargs or len(args) != 1 or (len(args) > 1 and not isinstance(args[0], int)):
             if self._filter:
@@ -371,6 +369,10 @@ class Table:
         self._offset = need_ofs
         return True
 
+    async def refresh(self):
+        pos = self.position
+        await self.seek(pos)
+
     async def next(self):
         """
         переход на следующую запись
@@ -482,7 +484,7 @@ class Table:
             if x not in nms:
                 raise_error("NA_FIELD", field=x, table=self._table)
             if qry:
-                qry += "and"
+                qry += " and "
             qry += f"{x} = {Field._Condition._lquot(self.row._data[x]._p_type, kwargs[x])}"
         return qry
 
@@ -573,6 +575,8 @@ class Table:
         """
         if args or kwargs:
             qry = self._gen_filter(*args, **kwargs)
+        elif self.key and isinstance(self.key, str):
+            qry = {self.key:self.row[self.key].value}
         elif self.key:
             qry = {x:self.row[x].value for x in self.key}
         else:
@@ -598,6 +602,7 @@ class Table:
         while n < len(args):
             if args[n]==ALL:
                 fltr = None
+                args = list(args)
                 del args[n]
             else:
                 n += 1

{ab_engine-0.2.3 → ab_engine-0.2.5}/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 toml 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
@@ -69,7 +72,11 @@ def typed_val(key, values: dict):
     return v, key
 
 
-def from_env(key:str, key_map:dict):
+def from_env(key:str, key_map:dict | str):
+    if isinstance(key_map, str):
+        if key in ENV:
+            Config._settings[key_map] = ENV[key]
+        return
     ret = {key_map[x]: ENV[x] for x in key_map if x in ENV}
     if key and "." in key:
         eval_key = key.split(".")
@@ -100,7 +107,7 @@ class Config:
     def initialized(cls):
         return cls._settings is not None
 
-    def __init__(self, path: Optional[str | list[str] | dict] = None, env_map: Optional[dict] = None, can_include: Optional[list]=None) -> None:
+    def __init__(self, path: Optional[str | list[str] | dict] = None, env_map: Optional[dict] = None, can_include: Optional[set]=None) -> None:
         if Config.initialized:
             return
 
@@ -119,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.3 → ab_engine-0.2.5}/ab_engine/env/db_context.py

@@ -39,7 +39,7 @@ class DB_ENV(UserDict):
         if isinstance(connection, DB_ENV):
             env = connection
             self._db_params = env._db_params.copy()
-            params = env._params.copy()
+            params = env.data.copy()
             connection = env.connection_string
         elif isinstance(connection, DB):
             connection = DB.connection.connection_string

{ab_engine-0.2.3 → ab_engine-0.2.5}/ab_engine/rpc/json_rpc.py

@@ -74,6 +74,7 @@ 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 res.get("error") is not None:
             self.log(f"{f}: ERROR:\n{res['error']}!!")

{ab_engine-0.2.3 → ab_engine-0.2.5}/ab_engine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ab_engine
-Version: 0.2.3
+Version: 0.2.5
 Summary: Library of standard modules
 Author-email: Andrew Bulatov <BulatovAndrew@gmail.com>
 License-Expression: MIT
@@ -10,7 +10,6 @@ Description-Content-Type: text/markdown
 Requires-Dist: json5>=0.12.0
 Requires-Dist: psycopg>=3.2.9
 Requires-Dist: pyyaml>=6.0.3
-Requires-Dist: toml>=0.10.2
 
 Библиотека стандартных модулей
 ==========================================================

{ab_engine-0.2.3 → ab_engine-0.2.5}/ab_engine.egg-info/requires.txt

@@ -1,4 +1,3 @@
 json5>=0.12.0
 psycopg>=3.2.9
 pyyaml>=6.0.3
-toml>=0.10.2

{ab_engine-0.2.3 → ab_engine-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ab_engine"
-version = "0.2.3"
+version = "0.2.5"
 description = "Library of standard modules"
 authors = [{name = "Andrew Bulatov", email = "BulatovAndrew@gmail.com"}]
 license = "MIT"
@@ -9,8 +9,7 @@ requires-python = ">=3.10"
 dependencies = [
     "json5>=0.12.0",
     "psycopg>=3.2.9",
-    "pyyaml>=6.0.3",
-    "toml>=0.10.2",
+    "pyyaml>=6.0.3"
 ]
 [project.urls]
 Repository = "https://github.com/a-bulatov/ab_engine"