arpakitlib 1.8.283__tar.gz → 1.8.294__tar.gz

{arpakitlib-1.8.283 → arpakitlib-1.8.294}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arpakitlib
-Version: 1.8.283
+Version: 1.8.294
 Summary: arpakitlib
 License: Apache-2.0
 License-File: LICENSE
@@ -35,7 +35,6 @@ Requires-Dist: gunicorn (>=23.0.0,<24.0.0)
 Requires-Dist: itsdangerous (>=2.2.0,<3.0.0)
 Requires-Dist: jupyter (>=1.1.1,<2.0.0)
 Requires-Dist: markdown (>=3.7,<4.0)
-Requires-Dist: matplotlib (>=3.10.0,<4.0.0)
 Requires-Dist: openai (>=2.2.0,<3.0.0)
 Requires-Dist: openpyxl (>=3.1.5,<4.0.0)
 Requires-Dist: orjson (>=3.10.15,<4.0.0)
@@ -43,6 +42,7 @@ Requires-Dist: pandas (>=2.2.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)
+Requires-Dist: poetry-plugin-export (>=1.9.0)
 Requires-Dist: psycopg2-binary (>=2.9.10,<3.0.0)
 Requires-Dist: pulp (>=2.9.0,<3.0.0)
 Requires-Dist: pydantic (>=2.10.5,<3.0.0)
@@ -69,7 +69,7 @@ Requires-Dist: xlsxwriter (>=3.2.5,<4.0.0)
 Project-URL: Documentation, https://github.com/ARPAKIT-Company/arpakitlib
 Project-URL: Homepage, https://github.com/ARPAKIT-Company/arpakitlib
 Project-URL: Repository, https://github.com/ARPAKIT-Company/arpakitlib
-Project-URL: arpakit_company_site, https://arpakit.com/
+Project-URL: arpakit_company_site, https://arpakit.com
 Project-URL: telegram_channel, https://t.me/arpakitlib
 Description-Content-Type: text/markdown
 

{arpakitlib-1.8.283 → arpakitlib-1.8.294}/arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_2.py

@@ -1,8 +1,10 @@
 import asyncio
 
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+
 
 def __sandbox():
-    pass
+    print(UserDBM.get_sd_property_names())
 
 
 async def __async_sandbox():

{arpakitlib-1.8.283 → arpakitlib-1.8.294}/arpakitlib/ar_list_util.py

@@ -47,6 +47,16 @@ def remove_from_list_if_left(*, list_: list[Any], values: list[Any]) -> list[Any
     return list_
 
 
+def remove_from_lists_if_left(
+        *,
+        lists_: list[list[Any]],
+        values: list[Any]
+):
+    for list_ in lists_:
+        remove_from_list_if_left(list_=list_, values=values)
+    return lists_
+
+
 def __example():
     a = remove_from_list_if_left(
         list_=[1,2,2,2,2,2,3,3,3,3,3,3],

{arpakitlib-1.8.283 → arpakitlib-1.8.294}/arpakitlib/ar_sqlalchemy_util.py

@@ -73,7 +73,7 @@ class BaseDBM(DeclarativeBase):
             *,
             include_pk: bool = True,
             exclude_names: list[str] | None = None,
-            exclude_if_have_foreign_keys: bool  = False
+            exclude_if_have_foreign_keys: bool = False
     ) -> list[str]:
         if exclude_names is None:
             exclude_names = []
@@ -123,7 +123,7 @@ class BaseDBM(DeclarativeBase):
             include_column_names: bool = True,
             include_column_pk: bool = True,
             exclude_column_names: list[str] | None = None,
-            exclude_column_names_if_have_foreign_keys: bool  = False,
+            exclude_column_names_if_have_foreign_keys: bool = False,
 
             include_relationship_names: bool = True,
             exclude_relationship_one_to_many: bool = False,
@@ -152,16 +152,26 @@ class BaseDBM(DeclarativeBase):
             cls,
             *,
             prefix: str = "sdp_",
-            remove_prefix: bool = False
+            remove_prefix: bool = False,
+            exclude_property_names: list[str] | None = None,
     ) -> list[str]:
-        props = [
-            name
-            for name, attr in vars(cls).items()
-            if isinstance(attr, property) and name.startswith(prefix)
-        ]
-        if remove_prefix:
-            return [name[len(prefix):] for name in props]
-        return props
+        exclude_property_names = set(exclude_property_names or [])
+        res: list[str] = []
+
+        # идём от потомка к базам, переопределения потомка «побеждают»
+        for c in cls.__mro__:
+            if c is object:
+                continue
+            for name, attr in c.__dict__.items():
+                if not isinstance(attr, property):
+                    continue
+                if not name.startswith(prefix):
+                    continue
+                if name in exclude_property_names or name in res:
+                    continue
+                res.append(name)
+
+        return [n[len(prefix):] for n in res] if remove_prefix else res
 
     def simple_dict(
             self,

arpakitlib-1.8.294/arpakitlib/uppercase_env_keys.py

@@ -0,0 +1,74 @@
+from __future__ import annotations
+
+import re
+from pathlib import Path
+from typing import Optional
+
+LINE_RE = re.compile(r"""
+    ^(?P<lead>\s*)
+    (?:(?P<export>export)\s+)?        # optional 'export '
+    (?P<key>[A-Za-z_][A-Za-z0-9_]*?)  # KEY
+    (?P<eq>\s*=\s*)                   # equals with any spaces around
+    (?P<val>.*)                       # value (raw, keep as-is)
+    $
+""", re.VERBOSE)
+
+COMMENT_RE = re.compile(r"^\s*#")
+
+
+def uppercase_env_keys(*, path: str | Path,
+                       output: Optional[str | Path] = None,
+                       backup: bool = False) -> Path:
+    """
+    Преобразует имена переменных в .env в верхний регистр.
+
+    :param path: путь к исходному .env
+    :param output: путь к файлу вывода. Если None — правит на месте.
+    :param backup: делать .bak при in-place
+    :return: путь к записанному файлу
+    """
+    src = Path(path)
+    if not src.exists():
+        raise FileNotFoundError(src)
+
+    text = src.read_text(encoding="utf-8-sig").splitlines(keepends=True)
+
+    seen_upper = set()
+    out_lines = []
+
+    for line in text:
+        # комментарии и пустые строки — как есть
+        if not line.strip() or COMMENT_RE.match(line):
+            out_lines.append(line)
+            continue
+
+        m = LINE_RE.match(line.rstrip("\n"))
+        if not m:
+            # строки без "=" или нестандартные — не трогаем
+            out_lines.append(line)
+            continue
+
+        lead = m.group("lead") or ""
+        export_kw = m.group("export") or ""
+        key = m.group("key")
+        eq = m.group("eq")
+        val = m.group("val")
+
+        key_up = key.upper()
+        # аккуратно соберем строку обратно (сохраняя пробелы/формат)
+        new_line = f"{lead}{(export_kw + ' ') if export_kw else ''}{key_up}{eq}{val}\n"
+        out_lines.append(new_line)
+
+        seen_upper.add(key_up)
+
+    # запись
+    if output is None:
+        if backup:
+            bak = src.with_suffix(src.suffix + ".bak")
+            bak.write_text("".join(text), encoding="utf-8")
+        dst = src
+    else:
+        dst = Path(output)
+
+    dst.write_text("".join(out_lines), encoding="utf-8")
+    return dst

{arpakitlib-1.8.283 → arpakitlib-1.8.294}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.283"
+version = "1.8.294"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_company", email = "support@arpakit.com" }
@@ -41,7 +41,6 @@ dependencies = [
     "itsdangerous (>=2.2.0,<3.0.0)",
     "email-validator (>=2.2.0,<3.0.0)",
     "jupyter (>=1.1.1,<2.0.0)",
-    "matplotlib (>=3.10.0,<4.0.0)",
     "openpyxl (>=3.1.5,<4.0.0)",
     "alembic (>=1.14.1,<2.0.0)",
     "pymongo (>=4.10.1,<5.0.0)",
@@ -70,6 +69,7 @@ dependencies = [
     "paramiko (>=4.0.0,<5.0.0)",
     "redis (>=6.4.0,<7.0.0)",
     "pytest (>=8.4.2,<9.0.0)",
+    "poetry-plugin-export (>=1.9.0)",
 ]
 
 
@@ -78,7 +78,7 @@ homepage = "https://github.com/ARPAKIT-Company/arpakitlib"
 repository = "https://github.com/ARPAKIT-Company/arpakitlib"
 documentation = "https://github.com/ARPAKIT-Company/arpakitlib"
 telegram_channel = "https://t.me/arpakitlib"
-arpakit_company_site = "https://arpakit.com/"
+arpakit_company_site = "https://arpakit.com"
 
 
 [tool.poetry]