arpakitlib 1.8.90__py3-none-any.whl → 1.8.92__py3-none-any.whl

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/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/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.dist-info → arpakitlib-1.8.92.dist-info}/METADATA

@@ -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.dist-info → arpakitlib-1.8.92.dist-info}/RECORD

@@ -233,7 +233,7 @@ arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/api_key.py
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/common.py,sha256=US1tueTCPvAdse6TLT6yRLUHbvwGGagApYhFJzE_6Yc,576
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/operation.py,sha256=ZPoq3SueGJfR_aWk-a6dIHRNmO1Qa-8kHUW0aR4ZW3g,920
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/story_log.py,sha256=GMSICxW_A8RTCtoENDEjce-R8GRLKtHa-OU5OLMdH5s,720
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py,sha256=Rn4CEv1paCLsDBe1GJRw4ZRCIzq2KNMz_PJMqQzsln8,1007
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py,sha256=L6evYvGCu_Ls3M4awfVYtALdEARdcuRg-BBwL6D2750,1204
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user_token.py,sha256=zpgpmBXUpM9EpOS3W-5BQc2r3B-40ykkL8ls8pm6te4,1005
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/const.py,sha256=dcvj5C9E2F2KCsGZPBBncQf_EvVJAC1qQgnyD8P4ZEw,6
@@ -362,7 +362,7 @@ arpakitlib/ar_hash_util.py,sha256=Iqy6KBAOLBQMFLWv676boI5sV7atT2B-fb7aCdHOmIQ,34
 arpakitlib/ar_http_request_util.py,sha256=4f10gbsReyi_93OAn0ErIPzJdzKEcnzs_3wGRk7-YAI,5424
 arpakitlib/ar_ip_util.py,sha256=aEAa1Hvobh9DWX7cmBAPLqnXSTiKe2hRk-WJaiKMaI8,1009
 arpakitlib/ar_json_db_util.py,sha256=5nELpAY1_5_iTN4nMcutQtJQ5Nt52-xiKELxEH65RkY,7240
-arpakitlib/ar_json_util.py,sha256=oSefv_GdexJkR0YpSh68u5YKX8wv0oh_AOlhPg4uU3g,2369
+arpakitlib/ar_json_util.py,sha256=jnVfpQ6QSDq8NgIlh_6ZzXDveOiybr7QSQkXutE7d2s,2676
 arpakitlib/ar_jwt_util.py,sha256=Rhm4ywoTAn6yOV8NLjDASfAtAtheROxxDP40G3XjnuQ,761
 arpakitlib/ar_list_of_dicts_to_xlsx.py,sha256=MyjEl4Jl4beLVZqLVQMMv0-XDtBD3Xh4Z_ZPDJeFu04,745
 arpakitlib/ar_list_util.py,sha256=2woOAHAU8oTIiVjZ8GLnx15odEaoQUq3Q0JPxlufFF0,457
@@ -381,11 +381,11 @@ arpakitlib/ar_sleep_util.py,sha256=OaLtRaJQWMkGjfj_mW1RB2P4RaSWsAIH8LUoXqsH0zM,1
 arpakitlib/ar_sqladmin_util.py,sha256=Jd33EX_fAso4bvrcDhNEYOUlUHkudbadNGOJDg7rqhQ,301
 arpakitlib/ar_sqlalchemy_util.py,sha256=Fo7xdHu1rjyHNj2XzN7r_yXbaajGK8dxBPsOL6-DzVU,10559
 arpakitlib/ar_ssh_runner_util.py,sha256=yvAwza480MkHKvLkDEsR7JNh2bYNs6P9rCVo4NA85NE,6865
-arpakitlib/ar_str_util.py,sha256=CuIptQwHP0msTLNJbp-OFAdInVeTY4P58p7jFdeGm-4,5591
+arpakitlib/ar_str_util.py,sha256=CAv0wH8nP5Ja59S-hEdmNhNrM_Fwy935d0zntLpJkx8,4309
 arpakitlib/ar_type_util.py,sha256=Cs_tef-Fc5xeyAF54KgISCsP11NHyzIsglm4S3Xx7iM,4049
 arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
-arpakitlib-1.8.90.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.90.dist-info/METADATA,sha256=Pth1foAS5Mi_8Dy3Eyme64pMLU5MQ4F96UMq_J8mJFM,3517
-arpakitlib-1.8.90.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-arpakitlib-1.8.90.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.90.dist-info/RECORD,,
+arpakitlib-1.8.92.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.92.dist-info/METADATA,sha256=-eIvGJmCUuJK4_CYLjmJubc_tRydjlVSYZmHsTHrqG8,3517
+arpakitlib-1.8.92.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+arpakitlib-1.8.92.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.92.dist-info/RECORD,,