arpakitlib 1.8.90__tar.gz → 1.8.92__tar.gz

{arpakitlib-1.8.90 → arpakitlib-1.8.92}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.8.90
+Version: 1.8.92
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company

{arpakitlib-1.8.90 → arpakitlib-1.8.92}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py

@@ -17,6 +17,9 @@ class UserMV(SimpleMV, model=UserDBM):
         UserDBM.roles,
         UserDBM.is_active,
         UserDBM.password,
+        UserDBM.tg_id,
+        UserDBM.tg_data,
+        UserDBM.tg_bot_last_action_dt,
         UserDBM.extra_data
     ]
     form_columns = [
@@ -26,6 +29,9 @@ class UserMV(SimpleMV, model=UserDBM):
         UserDBM.roles,
         UserDBM.is_active,
         UserDBM.password,
+        UserDBM.tg_id,
+        UserDBM.tg_data,
+        UserDBM.tg_bot_last_action_dt,
         UserDBM.extra_data
     ]
     column_sortable_list = sqlalchemy.inspect(UserDBM).columns
@@ -38,5 +44,6 @@ class UserMV(SimpleMV, model=UserDBM):
         UserDBM.slug,
         UserDBM.email,
         UserDBM.username,
-        UserDBM.password
+        UserDBM.password,
+        UserDBM.tg_id
     ]

{arpakitlib-1.8.90 → arpakitlib-1.8.92}/arpakitlib/ar_json_util.py

@@ -80,6 +80,22 @@ def write_dicts_iterly_in_json(
     return filepath
 
 
+def json_stream_iterator(
+        dict_iterable: Iterable[dict],
+):
+    yield "["
+
+    first = True
+    for dict_ in dict_iterable:
+        if not first:
+            yield ","
+        else:
+            first = False
+        yield transfer_data_to_json_str(dict_, fast=True, beautify=False)
+
+    yield "]"
+
+
 def __example():
     pass
 

{arpakitlib-1.8.90 → arpakitlib-1.8.92}/arpakitlib/ar_str_util.py

@@ -139,13 +139,21 @@ def lower_and_strip_or_none(value: Any) -> str | None:
     return None
 
 
+def is_float(value: str) -> bool:
+    try:
+        float(value)
+    except Exception:
+        return False
+    return True
+
+
 def int_or_float_or_none(value: Any) -> float | int | None:
     if isinstance(value, float) or isinstance(value, int):
         return value
     value = strip_or_none(value)
     if value is not None and value.isdigit():
         return int(value)
-    if value is not None and value.isdecimal():
+    if value is not None and is_float(value):
         return float(value)
     return None
 
@@ -163,46 +171,13 @@ def float_or_none(value: Any) -> float | None:
     if isinstance(value, float):
         return value
     value = strip_or_none(value)
-    if value is not None and value.isdecimal():
+    if value is not None and is_float(value):
         return float(value)
     return None
 
 
 def __example():
-    print(int_or_none("124.124"))
-
-    print("str_in:")
-    print(str_in(string="hello", main_string="hello world"))
-    print(str_in(string="bye", main_string="hello world"))
-    print(str_in(string="hello", main_string="hello world", max_diff=6))
-    print(str_in(string="hello", main_string="hello world", max_diff=1))
-
-    print("\nbidirectional_str_in:")
-    print(bidirectional_str_in(string1="hello", string2="hello world"))
-    print(bidirectional_str_in(string1="world", string2="hello world"))
-
-    print("\nstr_startswith:")
-    print(str_startswith(string="hello", main_string="hello world"))
-    print(str_startswith(string="world", main_string="hello world"))
-
-    print("\nbidirectional_str_startswith:")
-    print(bidirectional_str_startswith(string1="hello", string2="hello world"))
-    print(bidirectional_str_startswith(string1="world", string2="hello world"))
-
-    print("\nmake blank_if_none:")
-    print(make_blank_if_none())
-    print(make_blank_if_none(string="test"))
-
-    print("\nremove_html:")
-    print(remove_html(string="<div>Hello <b>World</b></div>"))
-
-    print("\nremove_tags:")
-    print(remove_tags(string="<div>Hello <b>World</b></div>"))
-
-    print("\nremove_tags_and_html:")
-    print(remove_tags_and_html("<div>Hello <b>World</b></div>"))
-
-    print(remove_markdown("# Тут обычный текст с **жирным** и *курсивным* выделением."))
+    pass
 
 
 if __name__ == '__main__':

{arpakitlib-1.8.90 → arpakitlib-1.8.92}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.90"
+version = "1.8.92"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_support", email = "support@arpakit.com" }