arpakitlib 1.8.78__py3-none-any.whl → 1.8.80__py3-none-any.whl

arpakitlib/ar_file_storage_in_dir_util.py

@@ -6,6 +6,8 @@ import shutil
 import uuid
 from typing import Optional, Union, Iterator
 
+from arpakitlib.ar_datetime_util import now_utc_dt
+
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 
@@ -50,7 +52,8 @@ class FileStorageInDir:
             file_extension: Optional[str] = None,
             content_to_write: Optional[Union[str, bytes]] = None,
             create: bool = False,
-            raise_if_exists: bool = True
+            raise_if_exists: bool = True,
+            add_datetime_in_filename: bool = False
     ) -> str:
         self.init()
 
@@ -69,6 +72,9 @@ class FileStorageInDir:
         if raise_if_exists and filename in os.listdir(self.dirpath):
             raise ValueError(f"file ({filename}) already exists")
 
+        if add_datetime_in_filename:
+            filename = f"{filename}--{now_utc_dt().isoformat()}"
+
         filepath = os.path.join(self.dirpath, filename)
 
         if create is True:

arpakitlib/ar_str_util.py

@@ -139,21 +139,38 @@ def lower_and_strip_or_none(value: Any) -> str | None:
     return None
 
 
-def float_or_none(value: Any) -> float | int | None:
+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() or value.isdecimal()):
+    if value is not None and value.isdigit():
+        return int(value)
+    if value is not None and value.isdecimal():
         return float(value)
     return None
 
 
 def int_or_none(value: Any) -> int | None:
+    if isinstance(value, int):
+        return value
     value = strip_or_none(value)
     if value is not None and value.isdigit():
         return int(value)
     return None
 
 
+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():
+        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"))

{arpakitlib-1.8.78.dist-info → arpakitlib-1.8.80.dist-info}/METADATA

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

{arpakitlib-1.8.78.dist-info → arpakitlib-1.8.80.dist-info}/RECORD

@@ -345,7 +345,7 @@ arpakitlib/ar_dream_ai_api_client_util.py,sha256=Z1oii_XSsgunYx17SdcHl54S4KPQti7
 arpakitlib/ar_encrypt_decrypt_util.py,sha256=GhWnp7HHkbhwFVVCzO1H07m-5gryr4yjWsXjOaNQm1Y,520
 arpakitlib/ar_enumeration_util.py,sha256=XoFInWtGzbIr6fJq0un5nettaDfOLAyY84ovwj7n_7g,3030
 arpakitlib/ar_exception_util.py,sha256=3hZKsj34TZVdmd4JAQz7w515smWqB8o3gTwAEjuMdnI,408
-arpakitlib/ar_file_storage_in_dir_util.py,sha256=D3e3rGuHoI6xqAA5mVvEpVVpOWY1jyjNsjj2UhyHRbE,3674
+arpakitlib/ar_file_storage_in_dir_util.py,sha256=dnSMTr9AX28wo8q4zHOZl89Zm0AFK6dOP-YzN_7Hays,3881
 arpakitlib/ar_file_util.py,sha256=GUdJYm1tUZnYpY-SIPRHAZBHGra8NKy1eYEI0D5AfhY,489
 arpakitlib/ar_func_util.py,sha256=lG0bx_DtxWN4skbUim0liRZ6WUyLVV8Qfk6iZNtCZOs,1042
 arpakitlib/ar_hash_util.py,sha256=Iqy6KBAOLBQMFLWv676boI5sV7atT2B-fb7aCdHOmIQ,340
@@ -371,11 +371,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=QUDnnsnA_1FvGM-RiUjz31PB92n-XUbDoz81pWkdvOM,5138
+arpakitlib/ar_str_util.py,sha256=CuIptQwHP0msTLNJbp-OFAdInVeTY4P58p7jFdeGm-4,5591
 arpakitlib/ar_type_util.py,sha256=Cs_tef-Fc5xeyAF54KgISCsP11NHyzIsglm4S3Xx7iM,4049
 arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
-arpakitlib-1.8.78.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.78.dist-info/METADATA,sha256=H0NbOYKglz5d4kfI-ZrCvDSbEKnFoHEIJDrn3-UeoWQ,3559
-arpakitlib-1.8.78.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-arpakitlib-1.8.78.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.78.dist-info/RECORD,,
+arpakitlib-1.8.80.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.80.dist-info/METADATA,sha256=3UK0mFRMuGCCrIwOC928Y14_ezqvqSw5sJyh2cEsO6k,3559
+arpakitlib-1.8.80.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+arpakitlib-1.8.80.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.80.dist-info/RECORD,,