arpakitlib 1.7.3__tar.gz → 1.7.4__tar.gz

{arpakitlib-1.7.3 → arpakitlib-1.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arpakitlib
-Version: 1.7.3
+Version: 1.7.4
 Summary: arpakitlib
 Home-page: https://github.com/ARPAKIT-Company/arpakitlib
 License: Apache-2.0
@@ -33,9 +33,9 @@ Requires-Dist: itsdangerous (>=2.2.0,<3.0.0)
 Requires-Dist: jupyter (>=1.1.1,<2.0.0)
 Requires-Dist: matplotlib (>=3.10.0,<4.0.0)
 Requires-Dist: openai (>=1.55.3,<2.0.0)
+Requires-Dist: openpyxl (>=3.1.5,<4.0.0)
 Requires-Dist: pandas (>=2.2.3,<3.0.0)
 Requires-Dist: paramiko (>=3.5.0,<4.0.0)
-Requires-Dist: psycopg-binary (>=3.2.3,<4.0.0)
 Requires-Dist: psycopg2-binary (>=2.9.10,<3.0.0)
 Requires-Dist: pydantic-settings (>=2.6.1,<3.0.0)
 Requires-Dist: pyjwt (>=2.10.1,<3.0.0)

{arpakitlib-1.7.3 → arpakitlib-1.7.4}/arpakitlib/_arpakit_project_template/.gitignore

@@ -41,9 +41,6 @@ config
 db.sqlite
 .env_test_prod
 .api_env
-./manage/Приложение_1.pdf
-./manage/Приложение_2.pdf
-./manage/СхемаРаботы.jpeg
 test.txt
 vk_config.v2.json
 .env_prod

arpakitlib-1.7.4/arpakitlib/_arpakit_project_template/ARPAKITLIB

@@ -0,0 +1 @@
+TRUE

arpakitlib-1.7.4/arpakitlib/_arpakit_project_template/README.md

@@ -0,0 +1,3 @@
+# {PROJECT_NAME}
+
+...

arpakitlib-1.7.4/arpakitlib/_arpakit_project_template/manage/example_init_arpakit_project_template.sh

@@ -0,0 +1 @@
+arpakitlib -c init_arpakit_project_template -project_dirpath ./ -overwrite_if_exists ... -project_name ... -ignore_paths_startswith ... -only_paths_startswith ...

arpakitlib-1.7.4/arpakitlib/_arpakit_project_template/manage/example_systemd.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=...
+
+[Service]
+User=...
+WorkingDirectory=...
+ExecStart=...
+RestartSec=5
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

{arpakitlib-1.7.3 → arpakitlib-1.7.4}/arpakitlib/_arpakit_project_template/manage/generate_env_example.py

@@ -7,7 +7,7 @@ from src.core.settings import Settings
 def command():
     env_example = Settings.generate_env_example()
     print(env_example)
-    with open(os.path.join(BASE_DIRPATH, ".env_example"), mode="w") as f:
+    with open(os.path.join(BASE_DIRPATH, "example.env"), mode="w") as f:
         f.write(env_example)
 
 

{arpakitlib-1.7.3 → arpakitlib-1.7.4}/arpakitlib/_arpakit_project_template/manage/git_push_arpakit_company_github_1.sh

@@ -1,4 +1,4 @@
 cd ..
 git add .
-git commit -m "no_message"
+git commit -m "fix"
 git push arpakit_company_github_1

{arpakitlib-1.7.3 → arpakitlib-1.7.4}/arpakitlib/_arpakit_project_template/manage/git_push_arpakit_company_gitlab_1.sh

@@ -1,4 +1,4 @@
 cd ..
 git add .
-git commit -m "no_message"
+git commit -m "fix"
 git push arpakit_company_gitlab_1

arpakitlib-1.7.4/arpakitlib/_arpakit_project_template/manage/git_push_arpakit_github_1.sh

@@ -0,0 +1,4 @@
+cd ..
+git add .
+git commit -m "fix"
+git push arpakit_github_1

arpakitlib-1.7.4/arpakitlib/_arpakit_project_template/manage/git_push_arpakit_gitlab_1.sh

@@ -0,0 +1,4 @@
+cd ..
+git add .
+git commit -m "fix"
+git push arpakit_gitlab_1

arpakitlib-1.7.4/arpakitlib/_arpakit_project_template/manage/git_set_arpakit_origin.sh

@@ -0,0 +1,7 @@
+cd ..
+
+git remote remove arpakit_github_1
+git remote add arpakit_github_1 git@github.com:arpakit/{PROJECT_NAME}.git
+
+git remote remove arpakit_gitlab_1
+git remote add arpakit_gitlab_1 git@gitlab.com:arpakit/{PROJECT_NAME}.git

{arpakitlib-1.7.3 → arpakitlib-1.7.4}/arpakitlib/_arpakit_project_template/src/core/settings.py

@@ -30,6 +30,8 @@ class Settings(SimpleSettings):
 
     dump_dirpath: str = os.path.join(var_dirpath, dump_dirname)
 
+    db_url: str | None = "postgresql://cosmos:cosmos@localhost:5432/cosmos"
+
 
 @lru_cache()
 def get_cached_settings() -> Settings:

{arpakitlib-1.7.3 → arpakitlib-1.7.4}/arpakitlib/_arpakit_project_template/src/core/util.py

@@ -1,8 +1,11 @@
 import asyncio
+import importlib
+from contextlib import suppress
 from functools import lru_cache
 
 from arpakitlib.ar_file_storage_in_dir_util import FileStorageInDir
 from arpakitlib.ar_logging_util import setup_normal_logging
+from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
 from src.core.settings import get_cached_settings
 
 
@@ -37,10 +40,22 @@ def get_cached_dump_file_storage_in_dir() -> FileStorageInDir:
     return create_dump_file_storage_in_dir()
 
 
+def create_sqlalchemy_db() -> SQLAlchemyDB:
+    with suppress(Exception):
+        importlib.import_module("src.db.sqlalchemy_model")
+
+    return SQLAlchemyDB(
+        db_url=get_cached_settings().db_url,
+    )
+
+
+@lru_cache()
+def get_cached_sqlalchemy_db() -> SQLAlchemyDB:
+    return create_sqlalchemy_db()
+
+
 def __example():
-    get_cached_cache_file_storage_in_dir().init()
-    get_cached_media_file_storage_in_dir().init()
-    get_cached_dump_file_storage_in_dir().init()
+    pass
 
 
 async def __async_example():

arpakitlib-1.7.4/arpakitlib/_arpakit_project_template/src/db/sqlalchemy_model.py

@@ -0,0 +1 @@
+# ...

{arpakitlib-1.7.3 → arpakitlib-1.7.4}/arpakitlib/ar_arpakitlib_cli.py

@@ -5,7 +5,7 @@ import sys
 from arpakitlib.ar_need_type_util import parse_need_type, NeedTypes
 from arpakitlib.ar_parse_command import parse_command
 from arpakitlib.ar_project_template_util import init_arpakit_project_template
-from arpakitlib.ar_str_util import raise_if_blank
+from arpakitlib.ar_str_util import raise_if_string_blank
 
 
 def arpakitlib_cli(*, full_command: str | None = None):
@@ -29,13 +29,14 @@ def arpakitlib_cli(*, full_command: str | None = None):
         )
 
     elif command == "init_arpakit_project_template":
-        project_dirpath = raise_if_blank(parsed_command.get_value_by_keys(keys=["pd", "project_dirpath"]))
+        project_dirpath = raise_if_string_blank(parsed_command.get_value_by_keys(keys=["pd", "project_dirpath"]))
         overwrite_if_exists: bool = parse_need_type(
             value=parsed_command.get_value_by_keys(keys=["oie", "overwrite_if_exists"]),
             need_type=NeedTypes.bool_,
             allow_none=False
         )
         project_name: str = parsed_command.get_value_by_keys(keys=["pm", "project_name"])
+        project_name = project_name if project_name.strip() else None
         ignore_paths_startswith: list[str] | None = parse_need_type(
             value=parsed_command.get_value_by_keys(keys=["ipsw", "ignore_paths_startswith"]),
             need_type=NeedTypes.list_of_str,

{arpakitlib-1.7.3 → arpakitlib-1.7.4}/arpakitlib/ar_project_template_util.py

@@ -3,7 +3,7 @@
 import logging
 import os
 
-from arpakitlib.ar_str_util import make_none_if_blank
+from arpakitlib.ar_str_util import make_none_if_blank, raise_if_string_blank
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
@@ -18,6 +18,8 @@ def init_arpakit_project_template(
         ignore_paths_startswith: list[str] | str | None = None,
         only_paths_startswith: list[str] | str | None = None
 ):
+    raise_if_string_blank(project_dirpath)
+
     if project_name:
         project_name = project_name.strip()
     project_name = make_none_if_blank(project_name)

{arpakitlib-1.7.3 → arpakitlib-1.7.4}/arpakitlib/ar_sqlalchemy_util.py

@@ -29,7 +29,7 @@ class SQLAlchemyDB:
             echo: bool = False,
             need_include_operation_dbm: bool = False,
             need_include_story_dbm: bool = False,
-            models: list[Any] = None
+            db_models: list[Any] | None = None
     ):
         self._logger = logging.getLogger(self.__class__.__name__)
         self.need_include_operation_dbm = need_include_operation_dbm

{arpakitlib-1.7.3 → arpakitlib-1.7.4}/arpakitlib/ar_str_util.py

@@ -58,7 +58,7 @@ def make_blank_if_none(string: Optional[str] = None) -> str:
     return string
 
 
-def make_none_if_blank(string: Optional[str] = None) -> str:
+def make_none_if_blank(string: Optional[str] = None) -> str | None:
     if not string:
         return None
     return string
@@ -79,7 +79,7 @@ def remove_tags_and_html(string: str) -> str:
     return remove_tags(remove_html(string))
 
 
-def raise_if_blank(string: str) -> str:
+def raise_if_string_blank(string: str) -> str:
     if not string:
         raise ValueError("not string")
     return string

{arpakitlib-1.7.3 → arpakitlib-1.7.4}/arpakitlib/ar_type_util.py

@@ -78,6 +78,12 @@ def make_none_to_false(v: Any) -> Any:
     return v
 
 
+def raise_if_none(v: Any) -> Any:
+    if v is None:
+        raise ValueError(f"v is None, v={v}")
+    return v
+
+
 def __example():
     pass
 

{arpakitlib-1.7.3 → arpakitlib-1.7.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arpakitlib"
-version = "1.7.3"
+version = "1.7.4"
 description = "arpakitlib"
 authors = ["arpakit <arpakit@gmail.com>", "arpakit_support <support@arpakit.com>"]
 license = "Apache License 2.0"
@@ -38,10 +38,8 @@ pymongo = "^4.10.1"
 paramiko = "^3.5.0"
 asyncssh = "^2.18.0"
 aiohttp-socks = "^0.9.1"
-psycopg-binary = "^3.2.3"
 uvicorn = "^0.32.1"
 gunicorn = "^23.0.0"
-psycopg2-binary = "^2.9.10"
 sqladmin = "^0.20.1"
 asyncpg = "^0.30.0"
 celery = "^5.4.0"
@@ -53,6 +51,8 @@ email-validator = "^2.2.0"
 
 jupyter = "^1.1.1"
 matplotlib = "^3.10.0"
+openpyxl = "^3.1.5"
+psycopg2-binary = "^2.9.10"
 [[tool.poetry.source]]
 name = "testpypi"
 url = "https://test.pypi.org/legacy/"

arpakitlib-1.7.3/arpakitlib/_arpakit_project_template/README.md

@@ -1,6 +0,0 @@
-# {PROJECT_NAME}
-
-....
-
-## ❤️ Made by ARPAKIT Company ❤️
-