arpakitlib 1.7.5__tar.gz → 1.7.9__tar.gz

{arpakitlib-1.7.5 → arpakitlib-1.7.9}/PKG-INFO

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

{arpakitlib-1.7.5 → arpakitlib-1.7.9}/arpakitlib/_arpakit_project_template/example.env

@@ -1,4 +1,5 @@
 # mode_type=
+name=
 # var_dirname=
 # var_dirpath=
 # log_filename=
@@ -9,3 +10,4 @@
 # media_dirpath=
 # dump_dirname=
 # dump_dirpath=
+# db_url=

arpakitlib-1.7.9/arpakitlib/_arpakit_project_template/manage/example_docker_run_postgres_for_dev.sh

@@ -0,0 +1,4 @@
+cd ..
+docker rm ..._postgres
+docker run --name ..._postgres -d -p ...:5432 -e POSTGRES_USER=... -e POSTGRES_PASSWORD=... -e POSTGRES_DB=... postgres:16 -c max_connections=100
+docker start ..._postgres

arpakitlib-1.7.9/arpakitlib/_arpakit_project_template/manage/example_docker_start_postgres_for_dev.sh

@@ -0,0 +1,2 @@
+cd ..
+docker start ..._postgres

arpakitlib-1.7.9/arpakitlib/_arpakit_project_template/manage/example_docker_stop_postgres_for_dev.sh

@@ -0,0 +1,2 @@
+cd ..
+docker stop ..._postgres

arpakitlib-1.7.9/arpakitlib/_arpakit_project_template/manage/example_nginx_proxy.nginx

@@ -0,0 +1,14 @@
+server {
+    listen 80;
+    listen [::]:80;
+
+    server_name www...;
+
+    location / {
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass ...;
+    }
+}

{arpakitlib-1.7.5 → arpakitlib-1.7.9}/arpakitlib/_arpakit_project_template/src/core/settings.py

@@ -30,7 +30,9 @@ class Settings(SimpleSettings):
 
     dump_dirpath: str = os.path.join(var_dirpath, dump_dirname)
 
-    db_url: str | None = "postgresql://cosmos:cosmos@localhost:5432/cosmos"
+    db_url: str | None = None
+
+    db_echo: bool = False
 
 
 @lru_cache()

{arpakitlib-1.7.5 → arpakitlib-1.7.9}/arpakitlib/_arpakit_project_template/src/core/util.py

@@ -46,6 +46,7 @@ def create_sqlalchemy_db() -> SQLAlchemyDB:
 
     return SQLAlchemyDB(
         db_url=get_cached_settings().db_url,
+        db_echo=get_cached_settings().db_echo
     )
 
 

arpakitlib-1.7.5/arpakitlib/ar_arpakitlib_cli.py → arpakitlib-1.7.9/arpakitlib/ar_arpakitlib_cli_util.py

@@ -8,7 +8,7 @@ from arpakitlib.ar_project_template_util import init_arpakit_project_template
 from arpakitlib.ar_str_util import raise_if_string_blank
 
 
-def arpakitlib_cli(*, full_command: str | None = None):
+def execute_arpakitlib_cli(*, full_command: str | None = None):
     if full_command is None:
         full_command = " ".join(sys.argv)
 
@@ -57,4 +57,4 @@ def arpakitlib_cli(*, full_command: str | None = None):
 
 
 if __name__ == '__main__':
-    arpakitlib_cli(full_command="/arpakitlib -c help")
+    execute_arpakitlib_cli(full_command="/arpakitlib -c help")

{arpakitlib-1.7.5 → arpakitlib-1.7.9}/arpakitlib/ar_settings_util.py

@@ -3,6 +3,7 @@
 from typing import Union
 
 from pydantic import ConfigDict, field_validator
+from pydantic_core import PydanticUndefined
 from pydantic_settings import BaseSettings
 
 from arpakitlib.ar_enumeration_util import Enumeration
@@ -11,7 +12,7 @@ from arpakitlib.ar_enumeration_util import Enumeration
 def generate_env_example(settings_class: Union[BaseSettings, type[BaseSettings]]):
     res = ""
     for k, f in settings_class.model_fields.items():
-        if f.default:
+        if f.default is not PydanticUndefined:
             res += f"# {k}=\n"
         else:
             res += f"{k}=\n"
@@ -22,11 +23,10 @@ class SimpleSettings(BaseSettings):
     model_config = ConfigDict(extra="ignore")
 
     class ModeTypes(Enumeration):
-        local: str = "local"
-        test: str = "preprod"
+        dev: str = "dev"
         prod: str = "prod"
 
-    mode_type: str = ModeTypes.local
+    mode_type: str = ModeTypes.dev
 
     @field_validator("mode_type")
     @classmethod
@@ -35,12 +35,8 @@ class SimpleSettings(BaseSettings):
         return v
 
     @property
-    def is_mode_type_local(self) -> bool:
-        return self.mode_type == self.ModeTypes.local
-
-    @property
-    def is_mode_type_test(self) -> bool:
-        return self.mode_type == self.ModeTypes.test
+    def is_mode_type_dev(self) -> bool:
+        return self.mode_type == self.ModeTypes.dev
 
     @property
     def is_mode_type_prod(self) -> bool:

{arpakitlib-1.7.5 → arpakitlib-1.7.9}/arpakitlib/ar_sqlalchemy_util.py

@@ -26,7 +26,7 @@ class SQLAlchemyDB:
             self,
             *,
             db_url: str = "postgresql://arpakitlib:arpakitlib@localhost:50629/arpakitlib",
-            echo: bool = False,
+            db_echo: bool = False,
             need_include_operation_dbm: bool = False,
             need_include_story_dbm: bool = False,
             db_models: list[Any] | None = None
@@ -38,7 +38,7 @@ class SQLAlchemyDB:
             self.need_include_story_dbm = True
         self.engine = create_engine(
             url=db_url,
-            echo=echo,
+            echo=db_echo,
             pool_size=5,
             max_overflow=10,
             poolclass=QueuePool,

{arpakitlib-1.7.5 → arpakitlib-1.7.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arpakitlib"
-version = "1.7.5"
+version = "1.7.9"
 description = "arpakitlib"
 authors = ["arpakit <arpakit@gmail.com>", "arpakit_support <support@arpakit.com>"]
 license = "Apache License 2.0"
@@ -64,4 +64,4 @@ requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.scripts]
-arpakitlib = "arpakitlib.ar_arpakitlib_cli:arpakitlib_cli"
+arpakitlib = "arpakitlib.ar_arpakitlib_cli_util:execute_arpakitlib_cli"

arpakitlib-1.7.5/arpakitlib/ar_hello_world.py

@@ -1,11 +0,0 @@
-# arpakit
-
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
-
-def hello_world():
-    print("Hello world, it is arpakitlib")
-
-
-if __name__ == '__main__':
-    hello_world()

{arpakitlib-1.7.5 → arpakitlib-1.7.9}/arpakitlib/ar_fastapi_util.py

@@ -582,11 +582,11 @@ def create_fastapi_app(
         contact: dict[str, Any] | None = None,
         media_dirpath: str | None = None
 ):
+    setup_normal_logging(log_filepath=log_filepath)
+
     if contact is None:
         contact = _DEFAULT_CONTACT
 
-    setup_normal_logging(log_filepath=log_filepath)
-
     if not startup_api_events:
         startup_api_events = [BaseStartupAPIEvent()]