arpakitlib 1.9.23__tar.gz → 1.9.37__tar.gz

{arpakitlib-1.9.23 → arpakitlib-1.9.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arpakitlib
-Version: 1.9.23
+Version: 1.9.37
 Summary: arpakitlib
 License-Expression: Apache-2.0
 License-File: LICENSE
@@ -37,6 +37,7 @@ Requires-Dist: markdown (>=3.7,<4.0)
 Requires-Dist: openai (>=2.6.1,<3.0.0)
 Requires-Dist: openpyxl (>=3.1.5,<4.0.0)
 Requires-Dist: orjson (>=3.10.15,<4.0.0)
+Requires-Dist: pandas (>=2.3.3,<3.0.0)
 Requires-Dist: paramiko (>=4.0.0,<5.0.0)
 Requires-Dist: pika (>=1.3.2,<2.0.0)
 Requires-Dist: poetry (>=2.0.1,<3.0.0)
@@ -46,6 +47,8 @@ Requires-Dist: pulp (>=2.9.0,<3.0.0)
 Requires-Dist: pydantic (>=2.10.5,<3.0.0)
 Requires-Dist: pydantic-settings (>=2.7.1,<3.0.0)
 Requires-Dist: pyjwt (>=2.10.1,<3.0.0)
+Requires-Dist: pyminizip (>=0.2.6,<0.3.0)
+Requires-Dist: pymongo (>=4.15.5,<5.0.0)
 Requires-Dist: pytelegrambotapi (>=4.29.1,<5.0.0)
 Requires-Dist: pytest (>=8.4.2,<9.0.0)
 Requires-Dist: pytz (>=2024.2,<2025.0)

{arpakitlib-1.9.23 → arpakitlib-1.9.37}/arpakitlib/ar_dict_util.py

@@ -49,6 +49,10 @@ def get_typed_from_dict(
     return val
 
 
+def sort_dict_by_keys(*, data: dict[str, Any]) -> dict[str, Any]:
+    return {k: data[k] for k in sorted(data)}
+
+
 def __example():
     pass
 

arpakitlib-1.9.37/arpakitlib/ar_generate_difficult_password_util.py

@@ -0,0 +1,36 @@
+import random
+import secrets
+import string
+import uuid
+
+
+def generate_difficult_password(*, difficult: int = 1):
+    # динамический диапазон длины
+    base = 32 + difficult * 16
+    variance = 64 + difficult * 32
+    target_len = random.randint(base, base + variance)
+
+    # ТОЛЬКО английские буквы и цифры
+    alphabet = string.ascii_letters + string.digits
+
+    password = []
+
+    # UUID-шум (hex = 0-9 + a-f)
+    for _ in range(difficult * 2):
+        password.append(uuid.uuid4().hex)
+
+    # основная часть
+    for _ in range(target_len):
+        password.append(secrets.choice(alphabet))
+
+    secrets.SystemRandom().shuffle(password)
+
+    return "".join(password)
+
+
+def __example():
+    print(generate_difficult_password(difficult=2))
+
+
+if __name__ == '__main__':
+    __example()

arpakitlib-1.9.37/arpakitlib/ar_make_zip_with_passwd.py

@@ -0,0 +1,20 @@
+# arpakit
+
+import pyminizip
+
+
+def make_zip_with_passwd(
+        *,
+        input_filepath: str,
+        output_filename: str = "archive.zip",
+        passwd: str = "123"
+) -> str:
+    pyminizip.compress(
+        input_filepath,  # исходный файл
+        None,
+        output_filename,  # архив
+        passwd,  # пароль
+        5  # уровень сжатия (1–9)
+    )
+    return output_filename
+

{arpakitlib-1.9.23 → arpakitlib-1.9.37}/arpakitlib/ar_sqlalchemy_etc_util.py

@@ -5,6 +5,10 @@ def _str_no_self(v: str) -> str:
     return v.replace("self.", "").strip()
 
 
+def _str_no_dbm(v: str) -> str:
+    return v.replace("dbm.", "").strip()
+
+
 def generate_sqlalchemy_model_repr(*, title: str, parts: list[Any]):
     res = []
     for part in parts:
@@ -16,6 +20,7 @@ def generate_sqlalchemy_model_repr(*, title: str, parts: list[Any]):
             part = str(part)
         elif isinstance(part, str):
             part = _str_no_self(part)
+            part = _str_no_dbm(part)
             part = part.strip()
         if not part:
             continue

{arpakitlib-1.9.23 → arpakitlib-1.9.37}/arpakitlib/ar_ssh_runner_util.py

@@ -10,9 +10,8 @@ from typing import Any
 
 import asyncssh
 import paramiko
-from pydantic import BaseModel, ConfigDict
-
 from arpakitlib.ar_json_util import transfer_data_to_json_str
+from pydantic import BaseModel, ConfigDict
 
 
 class BaseSSHException(Exception):
@@ -20,9 +19,11 @@ class BaseSSHException(Exception):
 
 
 class ConnectionSSHException(BaseSSHException):
-    def __init__(self, ssh_runner: SSHRunner, base_exception: Exception | None = None):
+    def __init__(self, ssh_runner: SSHRunner, base_exception: Exception | None = None,
+                 error_message: str | None = None):
         self.ssh_runner = ssh_runner
         self.base_exception = base_exception
+        self.error_message = error_message
 
     def format_message(self) -> str:
         parts = [
@@ -266,7 +267,7 @@ class SSHRunner:
             self.sync_client.connect(**connect_kwargs)
         except Exception as exception:
             self.sync_close()
-            raise ConnectionSSHException(ssh_runner=self, base_exception=exception)
+            raise ConnectionSSHException(ssh_runner=self, base_exception=exception, error_message=f"{exception=}")
 
         self._logger.info("connected")
 
@@ -289,7 +290,8 @@ class SSHRunner:
             command: str,
             *,
             timeout: float | None = timedelta(seconds=10).total_seconds(),
-            raise_for_bad_return_code: bool = True
+            raise_for_bad_return_code: bool = True,
+            stdin_data: str | bytes | None = None,
     ) -> SSHRunResult:
         if not command or not command.strip():
             raise ValueError("command must be a non-empty string")
@@ -306,9 +308,18 @@ class SSHRunner:
                 command=command,
                 timeout=timeout
             )
+
+            if stdin_data is not None:
+                if isinstance(stdin_data, str):
+                    stdin_data = stdin_data.encode()
+                stdin.write(stdin_data)
+                stdin.flush()
+                stdin.channel.shutdown_write()
+                stdin.close()
+
+            out = stdout.read().decode(errors="replace")
+            err = stderr.read().decode(errors="replace")
             return_code = stdout.channel.recv_exit_status()
-            stdout = stdout.read().decode()
-            stderr = stderr.read().decode()
         except Exception as exception:
             if self.auto_close_after_run:
                 self.sync_close()
@@ -318,8 +329,8 @@ class SSHRunner:
             self.sync_close()
 
         ssh_run_result = SSHRunResult(
-            out=stdout,
-            err=stderr,
+            out=out,
+            err=err,
             return_code=return_code,
             ssh_runner=self
         )

{arpakitlib-1.9.23 → arpakitlib-1.9.37}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.9.23"
+version = "1.9.37"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_company", email = "support@arpakit.com" }
@@ -65,6 +65,9 @@ dependencies = [
     "paramiko (>=4.0.0,<5.0.0)",
     "openai (>=2.6.1,<3.0.0)",
     "asyncssh (>=2.21.1,<3.0.0)",
+    "pymongo (>=4.15.5,<5.0.0)",
+    "pandas (>=2.3.3,<3.0.0)",
+    "pyminizip (>=0.2.6,<0.3.0)",
 ]
 
 

arpakitlib-1.9.23/arpakitlib/ar_generate_difficult_password_util.py

@@ -1,41 +0,0 @@
-import random
-import secrets
-import string
-import uuid
-
-
-def generate_difficult_password(*, difficult: int = 1):
-    # динамический диапазон длины
-    base = 32 + difficult * 16  # минимальная длина
-    variance = 64 + difficult * 32  # насколько может "гулять"
-    target_len = random.randint(base, base + variance)
-
-    alphabet = (
-            string.ascii_letters +
-            string.digits +
-            string.punctuation
-    )
-
-    password = []
-
-    # добавляем случайный шум из UUID блоков
-    for _ in range(difficult * 2):
-        noise_block = uuid.uuid4().hex
-        password.append(noise_block)
-
-    # основная часть пароля — криптостойкие символы
-    for _ in range(target_len):
-        password.append(secrets.choice(alphabet))
-
-    # финальная перемешка обеспечивает нерегулярность структуры
-    secrets.SystemRandom().shuffle(password)
-
-    return "".join(password)
-
-
-def __example():
-    pass
-
-
-if __name__ == '__main__':
-    __example()