arpakitlib 1.6.75__tar.gz → 1.6.78__tar.gz

{arpakitlib-1.6.75 → arpakitlib-1.6.78}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arpakitlib
-Version: 1.6.75
+Version: 1.6.78
 Summary: arpakitlib
 Home-page: https://github.com/ARPAKIT-Company/arpakitlib
 License: Apache-2.0
@@ -30,6 +30,8 @@ Requires-Dist: email-validator (>=2.2.0,<3.0.0)
 Requires-Dist: fastapi (>=0.115.5,<0.116.0)
 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: matplotlib (>=3.10.0,<4.0.0)
 Requires-Dist: openai (>=1.55.3,<2.0.0)
 Requires-Dist: pandas (>=2.2.3,<3.0.0)
 Requires-Dist: paramiko (>=3.5.0,<4.0.0)
@@ -86,6 +88,6 @@ pip install arpakitlib
 
 ---
 
-## ❤️ Made with Care by ARPAKIT Company ❤️
+## ❤️ Made by ARPAKIT Company ❤️
 
 

{arpakitlib-1.6.75 → arpakitlib-1.6.78}/README.md

@@ -35,5 +35,5 @@ pip install arpakitlib
 
 ---
 
-## ❤️ Made with Care by ARPAKIT Company ❤️
+## ❤️ Made by ARPAKIT Company ❤️
 

{arpakitlib-1.6.75 → arpakitlib-1.6.78}/arpakitlib/_ar_arpakitlib_cli.py

@@ -25,23 +25,30 @@ def _arpakitlib_cli(*, full_command: str | None = None):
         print(
             "Commands:"
             "\n- init_arpakit_project_template"
-            " (project_dirpath, remove_if_exists, project_name, ignore_src_dir, ignore_manage_dir)"
+            " (project_dirpath, overwrite_if_exists, project_name, ignore_paths_startswith, only_paths_startswith)"
         )
 
     elif command == "init_arpakit_project_template":
         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_
+            need_type=NeedTypes.bool_,
+            allow_none=False
         )
         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
+            need_type=NeedTypes.list_of_str,
+            allow_none=True
+        )
+        only_paths_startswith: list[str] | None = parse_need_type(
+            value=parsed_command.get_value_by_keys(keys=["ops", "only_paths_startswith"]),
+            need_type=NeedTypes.list_of_str,
+            allow_none=True
         )
         init_arpakit_project_template(
             project_dirpath=project_dirpath, overwrite_if_exists=overwrite_if_exists, project_name=project_name,
-            ignore_paths_startswith=ignore_paths_startswith
+            ignore_paths_startswith=ignore_paths_startswith, only_paths_startswith=only_paths_startswith
         )
 
     else:

arpakitlib-1.6.78/arpakitlib/_arpakit_project_template/README.md

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

arpakitlib-1.6.75/arpakitlib/_arpakit_project_template/manage/git_push_dev_arpakit_company_github_1.sh → arpakitlib-1.6.78/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 push arpakit_company_github_1 dev
+git push arpakit_company_github_1

arpakitlib-1.6.75/arpakitlib/_arpakit_project_template/manage/git_push_dev_arpakit_company_gitlab_1.sh → arpakitlib-1.6.78/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 push arpakit_company_gitlab_1 dev
+git push arpakit_company_gitlab_1

arpakitlib-1.6.75/arpakitlib/_arpakit_project_template/pyproject.toml → arpakitlib-1.6.78/arpakitlib/_arpakit_project_template/pyproject.toml.example

@@ -5,7 +5,7 @@ description = "{PROJECT_NAME}"
 authors = ["arpakit <arpakit@gmail.com>", "arpakit_support <support@arpakit.com>"]
 license = "Apache License 2.0"
 readme = "README.md"
-keywords = ["{PROJECT_NAME}", "arpakit", "arpakit-company", "arpakitcompany", "arpakit_company"]
+keywords = ["{PROJECT_NAME}", "arpakitlib", "arpakit", "arpakit-company", "arpakitcompany", "arpakit_company"]
 package-mode = false
 
 

{arpakitlib-1.6.75 → arpakitlib-1.6.78}/arpakitlib/ar_aiogram_util.py

@@ -293,7 +293,7 @@ def as_tg_command(
                                     f"Value (key={_param.key}, index={_param.index}) is required"
                                 )
                         else:
-                            value = parse_need_type(value=value, need_type=_param.need_type)
+                            value = parse_need_type(value=value, need_type=_param.need_type, allow_none=False)
 
                         kwargs[_param.key] = value
 

{arpakitlib-1.6.75 → arpakitlib-1.6.78}/arpakitlib/ar_base_worker_util.py

@@ -2,15 +2,22 @@
 
 import asyncio
 import logging
+import multiprocessing
+import threading
 from abc import ABC
 from datetime import timedelta
 
+from arpakitlib.ar_enumeration_util import Enumeration
 from arpakitlib.ar_sleep_util import sync_safe_sleep, async_safe_sleep
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 
 class BaseWorker(ABC):
+    class SafeRunInBackgroundModes(Enumeration):
+        async_task = "async_task"
+        thread = "thread"
+        process = "process"
 
     def __init__(self):
         self.worker_name = self.__class__.__name__
@@ -18,6 +25,27 @@ class BaseWorker(ABC):
         self.timeout_after_run = timedelta(seconds=0.1).total_seconds()
         self.timeout_after_err_in_run = timedelta(seconds=1).total_seconds()
 
+    def safe_run_in_background(self, *, safe_run_in_background_mode: str) -> (
+            asyncio.Task | threading.Thread | multiprocessing.Process
+    ):
+        if safe_run_in_background_mode == self.SafeRunInBackgroundModes.async_task:
+            res: asyncio.Task = asyncio.create_task(self.async_safe_run())
+        elif safe_run_in_background_mode == self.SafeRunInBackgroundModes.thread:
+            res: threading.Thread = threading.Thread(
+                target=self.sync_safe_run,
+                daemon=True
+            )
+            res.start()
+        elif safe_run_in_background_mode == self.SafeRunInBackgroundModes.process:
+            res: multiprocessing.Process = multiprocessing.Process(
+                target=self.sync_safe_run,
+                daemon=True
+            )
+            res.start()
+        else:
+            raise ValueError(f"unrecognized safe_run_mode={safe_run_in_background_mode}")
+        return res
+
     def sync_on_startup(self):
         pass
 

{arpakitlib-1.6.75 → arpakitlib-1.6.78}/arpakitlib/ar_fastapi_util.py

@@ -4,10 +4,8 @@ from __future__ import annotations
 
 import asyncio
 import logging
-import multiprocessing
 import os.path
 import pathlib
-import threading
 import traceback
 from datetime import datetime
 from typing import Any, Callable
@@ -403,33 +401,14 @@ class InitSqlalchemyDBStartupAPIEvent(BaseStartupAPIEvent):
         self.sqlalchemy_db.init()
 
 
-class SafeRunWorkerModes(Enumeration):
-    async_task = "async_task"
-    thread = "thread"
-    process = "process"
-
-
 class SafeRunWorkerStartupAPIEvent(BaseStartupAPIEvent):
-    def __init__(self, worker: BaseWorker, safe_run_mode: str):
+    def __init__(self, worker: BaseWorker, safe_run_in_background_mode: str):
         super().__init__()
         self.worker = worker
-        self.safe_run_mode = safe_run_mode
+        self.safe_run_in_background_mode = safe_run_in_background_mode
 
     def async_on_startup(self, *args, **kwargs):
-        if self.safe_run_mode == SafeRunWorkerModes.async_task:
-            _ = asyncio.create_task(self.worker.async_safe_run())
-        elif self.safe_run_mode == SafeRunWorkerModes.thread:
-            thread = threading.Thread(
-                target=self.worker.sync_safe_run,
-                daemon=True
-            )
-            thread.start()
-        elif self.safe_run_mode == SafeRunWorkerModes.process:
-            process = multiprocessing.Process(
-                target=self.worker.sync_safe_run,
-                daemon=True
-            )
-            process.start()
+        self.worker.safe_run_in_background(safe_run_in_background_mode=self.safe_run_in_background_mode)
 
 
 class BaseTransmittedAPIData(BaseModel):

{arpakitlib-1.6.75 → arpakitlib-1.6.78}/arpakitlib/ar_need_type_util.py

@@ -19,7 +19,10 @@ class NeedTypes(Enumeration):
     json = "json"
 
 
-def parse_need_type(value: Any, need_type: str) -> Any:
+def parse_need_type(value: Any, need_type: str, allow_none: bool = False) -> Any:
+    if allow_none and value is None:
+        return None
+
     NeedTypes.parse_and_validate_values(need_type)
 
     if need_type == NeedTypes.str_:

{arpakitlib-1.6.75 → arpakitlib-1.6.78}/arpakitlib/ar_project_template_util.py

@@ -15,7 +15,8 @@ def init_arpakit_project_template(
         project_dirpath: str,
         overwrite_if_exists: bool = False,
         project_name: str | None = None,
-        ignore_paths_startswith: list[str] | str | None = None
+        ignore_paths_startswith: list[str] | str | None = None,
+        only_paths_startswith: list[str] | str | None = None
 ):
     if project_name:
         project_name = project_name.strip()
@@ -26,17 +27,35 @@ def init_arpakit_project_template(
     if ignore_paths_startswith is None:
         ignore_paths_startswith = []
 
+    if isinstance(only_paths_startswith, str):
+        only_paths_startswith = [only_paths_startswith]
+    if only_paths_startswith is None:
+        only_paths_startswith = []
+
     def _generate_filepath_to_content() -> dict[str, str]:
-        arpakit_project_template_dirpath = os.path.abspath("_arpakit_project_template")
+        arpakit_project_template_dirpath = os.path.join(
+            os.path.dirname(os.path.abspath(__file__)), "_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}")
+                if (
+                        ignore_paths_startswith
+                        and
+                        any(rel_path.startswith(ignore_path) for ignore_path in ignore_paths_startswith)
+                ):
+                    _logger.info(f"ignoring file: {rel_path}")
+                    continue
+                if (
+                        only_paths_startswith
+                        and
+                        not any(rel_path.startswith(only_path) for only_path in only_paths_startswith)
+                ):
+                    _logger.info(f"ignoring file: {rel_path}")
                     continue
-                with open(os.path.join(root, file), "r", encoding='utf-8') as _file:
+                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)

{arpakitlib-1.6.75 → arpakitlib-1.6.78}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arpakitlib"
-version = "1.6.75"
+version = "1.6.78"
 description = "arpakitlib"
 authors = ["arpakit <arpakit@gmail.com>", "arpakit_support <support@arpakit.com>"]
 license = "Apache License 2.0"
@@ -51,6 +51,8 @@ twine = "^6.0.1"
 itsdangerous = "^2.2.0"
 email-validator = "^2.2.0"
 
+jupyter = "^1.1.1"
+matplotlib = "^3.10.0"
 [[tool.poetry.source]]
 name = "testpypi"
 url = "https://test.pypi.org/legacy/"

arpakitlib-1.6.75/arpakitlib/_arpakit_project_template/README.md

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