arpakitlib 1.6.72__py3-none-any.whl → 1.6.75__py3-none-any.whl

arpakitlib/_ar_arpakitlib_cli.py

@@ -1,18 +1,16 @@
 # arpakit
 
-import logging
 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_string_blank
+from arpakitlib.ar_str_util import raise_if_blank
 
-_logger = logging.getLogger(__name__)
 
-
-def _arpakitlib_cli(*, full_command: str):
-    _logger.info("start _arpakitlib_cli")
+def _arpakitlib_cli(*, full_command: str | None = None):
+    if full_command is None:
+        full_command = " ".join(sys.argv)
 
     parsed_command = parse_command(text=full_command)
     parsed_command.raise_for_command(needed_command="arpakitlib", lower_=True)
@@ -23,29 +21,32 @@ def _arpakitlib_cli(*, full_command: str):
     if not command:
         raise Exception(f"not command, command={command}")
 
-    _logger.info(f"start {command}")
-
     if command == "help":
-        pass
+        print(
+            "Commands:"
+            "\n- init_arpakit_project_template"
+            " (project_dirpath, remove_if_exists, project_name, ignore_src_dir, ignore_manage_dir)"
+        )
 
     elif command == "init_arpakit_project_template":
-        project_dirpath = raise_if_string_blank(parsed_command.get_value_by_keys(keys=["pd", "project_dirpath"]))
-        remove_if_exists: bool = parse_need_type(
-            value=parsed_command.get_value_by_keys(keys=["rie", "remove_if_exists"]),
+        project_dirpath = raise_if_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_
         )
-        project_name = raise_if_string_blank(parsed_command.get_value_by_keys(keys=["pm", "project_name"]))
+        project_name: str = parsed_command.get_value_by_keys(keys=["pm", "project_name"])
+        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
+        )
         init_arpakit_project_template(
-            project_dirpath=project_dirpath, remove_if_exists=remove_if_exists, project_name=project_name
+            project_dirpath=project_dirpath, overwrite_if_exists=overwrite_if_exists, project_name=project_name,
+            ignore_paths_startswith=ignore_paths_startswith
         )
 
     else:
         raise Exception(f"not recognized command, command={command}")
 
-    _logger.info(f"finish {command}")
-
-    _logger.info("finish _arpakitlib_cli")
-
 
 if __name__ == '__main__':
-    _arpakitlib_cli(full_command=" ".join(sys.argv))
+    _arpakitlib_cli(full_command="/arpakitlib -c help")

arpakitlib/ar_parse_command.py

@@ -1,5 +1,5 @@
 # arpakit
-
+import os
 import shlex
 
 from pydantic import BaseModel
@@ -15,6 +15,7 @@ class BadCommandFormat(Exception):
 
 class ParsedCommand(BaseModel):
     command: str
+    full_command: str
     key_to_value: dict[str, str | None] = {}
     values_without_key: list[str] = []
 
@@ -67,6 +68,7 @@ class ParsedCommand(BaseModel):
 
 
 def parse_command(text: str) -> ParsedCommand:
+    text = text.removeprefix("/")
     text = " ".join([text_.strip() for text_ in text.split(" ") if text_.strip()]).strip()
 
     parts = shlex.split(text)
@@ -75,7 +77,7 @@ def parse_command(text: str) -> ParsedCommand:
     if len(parts[0]) == 1:
         raise BadCommandFormat("len(parts[0]) == 1")
 
-    res = ParsedCommand(command=parts[0])
+    res = ParsedCommand(full_command=parts[0], command=os.path.basename(parts[0]).removeprefix("/"))
 
     last_key: str | None = None
     for part in parts[1:]:

arpakitlib/ar_project_template_util.py

@@ -1,8 +1,9 @@
 # arpakit
+
 import logging
 import os
 
-from arpakitlib.ar_file_util import raise_if_path_not_exists
+from arpakitlib.ar_str_util import make_none_if_blank
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
@@ -10,46 +11,52 @@ _logger = logging.getLogger(__name__)
 
 
 def init_arpakit_project_template(
-        *, project_dirpath: str, remove_if_exists: bool = False, project_name: str | None = None
+        *,
+        project_dirpath: str,
+        overwrite_if_exists: bool = False,
+        project_name: str | None = None,
+        ignore_paths_startswith: list[str] | str | None = None
 ):
     if project_name:
         project_name = project_name.strip()
-    if not project_name:
-        project_name = None
-
-    source_template_dirpath = os.path.join(os.path.dirname(__file__), "_arpakit_project_template")
-
-    raise_if_path_not_exists(path=source_template_dirpath)
-
-    project_dirpath = os.path.abspath(project_dirpath)
-
-    filepath_to_content = {}
-
-    for root_filepath, dir_filepaths, file_filepaths in os.walk(source_template_dirpath):
-        dir_filepaths[:] = [d for d in dir_filepaths if d != "__pycache__"]
-        relative_filepath = os.path.relpath(root_filepath, source_template_dirpath)
-        target_root_filepath = os.path.normpath(os.path.join(project_dirpath, relative_filepath))
-        for file in file_filepaths:
-            source_file_filepath = os.path.join(root_filepath, file)
-            target_file_filepath = os.path.normpath(os.path.join(target_root_filepath, file))
-
-            with open(source_file_filepath, "r", encoding="utf-8") as f:
-                content = f.read()
-
-            if project_name is not None:
-                content = content.replace("{PROJECT_NAME}", project_name)
-
-            filepath_to_content[target_file_filepath] = content
+    project_name = make_none_if_blank(project_name)
+
+    if isinstance(ignore_paths_startswith, str):
+        ignore_paths_startswith = [ignore_paths_startswith]
+    if ignore_paths_startswith is None:
+        ignore_paths_startswith = []
+
+    def _generate_filepath_to_content() -> dict[str, str]:
+        arpakit_project_template_dirpath = os.path.abspath("_arpakit_project_template")
+        res = {}
+        for root, dirs, files in os.walk(arpakit_project_template_dirpath):
+            dirs[:] = [d for d in dirs if d != '__pycache__']
+            for file in files:
+                rel_path = os.path.relpath(os.path.join(root, file), arpakit_project_template_dirpath)
+                if any(rel_path.startswith(ignore_path) for ignore_path in ignore_paths_startswith):
+                    _logger.info(f"Ignoring file: {rel_path}")
+                    continue
+                with open(os.path.join(root, file), "r", encoding='utf-8') as _file:
+                    _content = _file.read()
+                if project_name:
+                    _content = _content.replace("{PROJECT_NAME}", project_name)
+                res[rel_path] = _content
+        return res
+
+    filepath_to_content = _generate_filepath_to_content()
 
     if not os.path.exists(project_dirpath):
         os.makedirs(project_dirpath)
 
-    for target_file_filepath, content in filepath_to_content.items():
-        if os.path.exists(target_file_filepath) and not remove_if_exists:
-            _logger.info(f"skip existing file: {target_file_filepath}")
+    for filepath, content in filepath_to_content.items():
+        full_filepath = os.path.join(project_dirpath, filepath)
+
+        if os.path.exists(full_filepath) and not overwrite_if_exists:
+            _logger.info(f"file exists and overwrite_if_exists is False, skipping: {full_filepath}")
             continue
-        _logger.info(f"initing file: {target_file_filepath}")
-        os.makedirs(os.path.dirname(target_file_filepath), exist_ok=True)
-        with open(target_file_filepath, "w", encoding="utf-8") as f:
-            f.write(content)
-        _logger.info(f"file was inited: {target_file_filepath}")
+
+        _logger.info(f"creating file: {full_filepath}")
+        os.makedirs(os.path.dirname(full_filepath), exist_ok=True)
+        with open(full_filepath, "w", encoding="utf-8") as file_:
+            file_.write(content)
+        _logger.info(f"file created: {full_filepath}")

arpakitlib/ar_str_util.py

@@ -52,12 +52,18 @@ def bidirectional_str_startswith(string1: str, string2: str, max_diff: Optional[
     return False
 
 
-def blank_if_none(string: Optional[str] = None) -> str:
+def make_blank_if_none(string: Optional[str] = None) -> str:
     if string is None:
         return ""
     return string
 
 
+def make_none_if_blank(string: Optional[str] = None) -> str:
+    if not string:
+        return None
+    return string
+
+
 def remove_html(string: str) -> str:
     raise_for_type(string, str)
     return BeautifulSoup(string, "html.parser").text
@@ -73,7 +79,7 @@ def remove_tags_and_html(string: str) -> str:
     return remove_tags(remove_html(string))
 
 
-def raise_if_string_blank(string: str) -> str:
+def raise_if_blank(string: str) -> str:
     if not string:
         raise ValueError("not string")
     return string

{arpakitlib-1.6.72.dist-info → arpakitlib-1.6.75.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arpakitlib
-Version: 1.6.72
+Version: 1.6.75
 Summary: arpakitlib
 Home-page: https://github.com/ARPAKIT-Company/arpakitlib
 License: Apache-2.0

{arpakitlib-1.6.72.dist-info → arpakitlib-1.6.75.dist-info}/RECORD

@@ -1,5 +1,5 @@
 arpakitlib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_ar_arpakitlib_cli.py,sha256=WDvWWjWs8JPgvK1j2DGaS7ybvbFlfFV_v_CW7iU6PoE,1694
+arpakitlib/_ar_arpakitlib_cli.py,sha256=mXZkdO2lNVno-W6zqwBWqozYbG77lq9x4CmUnEshgnc,2007
 arpakitlib/_arpakit_project_template/.env_example,sha256=IMwmQFJZKztgc-uXQz6YzplVrdFyOs7xLiEfmlLDp8c,69
 arpakitlib/_arpakit_project_template/.gitignore,sha256=LVqBflpdgeidDY52su41mFA6a9hClSjNG-O0itRyLFc,496
 arpakitlib/_arpakit_project_template/.python-version,sha256=XMd40XBnlTFfBSmMldd-7VdqXNyFCy6wtxhw5e1mnhc,7
@@ -29,6 +29,7 @@ arpakitlib/_arpakit_project_template/manage/poetry_remove_and_add_arpakitlib.sh,
 arpakitlib/_arpakit_project_template/manage/poetry_show.sh,sha256=pclR9efCNrrGyJR2HrdDM4PCUFGg0OSlRtjQ3Srv8W8,24
 arpakitlib/_arpakit_project_template/manage/poetry_update.sh,sha256=49tIXIzfXanbN5IIM6mkYcHRZQOlu-uHHRqVg3EWosU,31
 arpakitlib/_arpakit_project_template/manage/poetry_update_arpakitlib.sh,sha256=chVSeDzTeKzwKld6h2kBx_Gd0dU2DZf0lJGlgPQtBfs,164
+arpakitlib/_arpakit_project_template/manage/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/pyproject.toml,sha256=lg2XoLCzS-ytsWE7xSKS-mgT_S6nr3jEZjP0UG0KThQ,472
 arpakitlib/_arpakit_project_template/resource/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -88,9 +89,9 @@ arpakitlib/ar_mongodb_util.py,sha256=2ECkTnGAZ92qxioL-fmN6R4yZOSr3bXdXLWTzT1C3vk
 arpakitlib/ar_need_type_util.py,sha256=n2kBETxzOSVhSVoy7qUtHtuQzgrrxzgi1_iVQimPb9o,1615
 arpakitlib/ar_openai_util.py,sha256=dHUbfg1sVVCjsNl_fra3iCMEz1bR-Hk9fE-DdYbu7Wc,1215
 arpakitlib/ar_operation_execution_util.py,sha256=w_dz4XYEM4WbTxpBoYVkknG3U3_391cJmitgljJJTO0,12373
-arpakitlib/ar_parse_command.py,sha256=hMk1WQypw4HqBFCFUKCzYSgjY7m5o1YH7-vlNAXVxsQ,3323
+arpakitlib/ar_parse_command.py,sha256=-s61xcATIsfw1eV_iD3xi-grsitbGzSDoAFc5V0OFy4,3447
 arpakitlib/ar_postgresql_util.py,sha256=1AuLjEaa1Lg4pzn-ukCVnDi35Eg1k91APRTqZhIJAdo,945
-arpakitlib/ar_project_template_util.py,sha256=tf504CWE1WP1jDRJ_QG4bDN139NsLnb_9SvJuKeN-uw,2131
+arpakitlib/ar_project_template_util.py,sha256=UciA86IX6rcooA6aEPSzu6AvdtJcUR5aD6wXiKVUmVU,2366
 arpakitlib/ar_run_cmd_util.py,sha256=D_rPavKMmWkQtwvZFz-Io5Ak8eSODHkcFeLPzNVC68g,1072
 arpakitlib/ar_schedule_uust_api_client_util.py,sha256=0X4yACjt8cxMvuoZUq4S0HuVhVUQW5fGmiPcG7vwM8Y,6027
 arpakitlib/ar_settings_util.py,sha256=kJ5L2Ik-spgMjMjGZ6ZvPHv6T8dtip1sm-39HI6htvc,1214
@@ -98,13 +99,13 @@ arpakitlib/ar_sleep_util.py,sha256=9ZN4Qo4eZ_q3hjM7vNBQjFRcH-9-sqv3QLSjnxVJE90,1
 arpakitlib/ar_sqlalchemy_model_util.py,sha256=ttdgOwQfoHTKqgivBtXoSbJoBCASHDjLEFK5tJ9kNNE,4779
 arpakitlib/ar_sqlalchemy_util.py,sha256=3wejwPbH5VsTZAWvJQ4qQ8tda-PWBmqVThwRyKnyGqo,4153
 arpakitlib/ar_ssh_util.py,sha256=jlnss4V4pziBN1rBzoK_lDiWm6nMOqGXfa6NFJSKH-Y,6796
-arpakitlib/ar_str_util.py,sha256=kvsHTxcV6D4_GFPo48IGAbkRhom7rDgtGj6N10UWNyU,2010
+arpakitlib/ar_str_util.py,sha256=AhcdrEm-pXRilCaDWCdTfVkQSy0SnbE52ur43Ltr6cI,2128
 arpakitlib/ar_type_util.py,sha256=5nDnXL5Oyozlg8XvxMrogsoYiG8_atItg46A0mtv-pk,2025
 arpakitlib/ar_yookassa_api_client_util.py,sha256=5GMvu8paByni8buhc1vpHB7n6oXe0gPfj1LSvnyZCrQ,5307
 arpakitlib/ar_zabbix_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
-arpakitlib-1.6.72.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.6.72.dist-info/METADATA,sha256=ZXvvmdUBA_iO9axyMgJyL0YNbFb-11t7q714BWIL97E,2665
-arpakitlib-1.6.72.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
-arpakitlib-1.6.72.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-arpakitlib-1.6.72.dist-info/entry_points.txt,sha256=RybYAcp2JEzQ3o5n9uFS4Ul3IKDx4Iojp63Wp6nbj04,76
-arpakitlib-1.6.72.dist-info/RECORD,,
+arpakitlib-1.6.75.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.6.75.dist-info/METADATA,sha256=eWoPgz2mbl0VWjTg2F_HPZg1LEvpsxd_T3fJq6zPC7Y,2665
+arpakitlib-1.6.75.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
+arpakitlib-1.6.75.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+arpakitlib-1.6.75.dist-info/entry_points.txt,sha256=RybYAcp2JEzQ3o5n9uFS4Ul3IKDx4Iojp63Wp6nbj04,76
+arpakitlib-1.6.75.dist-info/RECORD,,