arpakitlib 1.8.8__tar.gz → 1.8.10__tar.gz

{arpakitlib-1.8.8 → arpakitlib-1.8.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.8.8
+Version: 1.8.10
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company

{arpakitlib-1.8.8 → arpakitlib-1.8.10}/arpakitlib/_arpakit_project_template_v_2/README.md

@@ -1,5 +1,6 @@
-# ...
+# project
 
 ## ❤️ Made by ARPAKIT Company ❤️
-- https://arpakit.com/#
+
+- https://arpakit.com/
 

{arpakitlib-1.8.8 → arpakitlib-1.8.10}/arpakitlib/_arpakit_project_template_v_2/alembic/env.py

@@ -6,7 +6,7 @@ from sqlalchemy import pool
 
 from arpakitlib.ar_type_util import raise_for_type
 from project.core.settings import get_cached_settings
-from project.sqlalchemy_db_.sqlalchemy_model import get_simple_dbm
+from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
@@ -24,7 +24,7 @@ if config.config_file_name is not None:
 # for 'autogenerate' support
 # from myapp import mymodel
 # target_metadata = mymodel.Base.metadata
-target_metadata = get_simple_dbm().metadata
+target_metadata = SimpleDBM.metadata
 
 
 # other values from the config, defined by the needs of env.py,

{arpakitlib-1.8.8 → arpakitlib-1.8.10}/arpakitlib/_arpakit_project_template_v_2/command/git_set_arpakit_company_origin.sh

@@ -7,3 +7,5 @@ git remote add arpakit_company_github_1 git@github.com:ARPAKIT-Company/${project
 
 git remote remove arpakit_company_gitlab_1
 git remote add arpakit_company_gitlab_1 git@gitlab.com:ARPAKIT-Company/${project_name}.git
+
+git remote -v

{arpakitlib-1.8.8 → arpakitlib-1.8.10}/arpakitlib/_arpakit_project_template_v_2/command/git_set_arpakit_origin.sh

@@ -6,4 +6,6 @@ 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
+git remote add arpakit_gitlab_1 git@gitlab.com:arpakit/${project_name}.git
+
+git remote -v

{arpakitlib-1.8.8 → arpakitlib-1.8.10}/arpakitlib/_arpakit_project_template_v_2/command/git_set_divarteam_origin.sh

@@ -3,4 +3,6 @@ cd ..
 source .env
 
 git remote remove divarteam_github_1
-git remote add divarteam_github_1 git@github.com:divarteam/${project_name}.git
+git remote add divarteam_github_1 git@github.com:divarteam/${project_name}.git
+
+git remote -v

{arpakitlib-1.8.8 → arpakitlib-1.8.10}/arpakitlib/_arpakit_project_template_v_2/project/api/schema/v1/out.py

@@ -4,7 +4,7 @@ import datetime as dt
 from typing import Any
 
 from project.api.schema.base_schema import BaseSO
-from project.sqlalchemy_db_.sqlalchemy_model import StoryLogDBM, OperationDBM
+from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM, StoryLogDBM
 
 
 class BaseV1SO(BaseSO):

{arpakitlib-1.8.8 → arpakitlib-1.8.10}/arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_db.py

@@ -2,7 +2,7 @@ from functools import lru_cache
 
 from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDb
 from project.core.settings import get_cached_settings
-from project.sqlalchemy_db_.sqlalchemy_model import get_simple_dbm
+from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
 
 
 def create_sqlalchemy_db() -> SQLAlchemyDb | None:
@@ -13,7 +13,7 @@ def create_sqlalchemy_db() -> SQLAlchemyDb | None:
         sync_db_url=get_cached_settings().sqlalchemy_sync_db_url,
         async_db_url=get_cached_settings().sqlalchemy_async_db_url,
         db_echo=get_cached_settings().sqlalchemy_db_echo,
-        base_dbm=get_simple_dbm()
+        base_dbm=SimpleDBM
     )
 
 

arpakitlib-1.8.10/arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_model/__init__.py

@@ -0,0 +1,7 @@
+from arpakitlib.ar_sqlalchemy_util import get_string_info_from_declarative_base
+from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
+from project.sqlalchemy_db_.sqlalchemy_model.operation import OperationDBM
+from project.sqlalchemy_db_.sqlalchemy_model.story_log import StoryLogDBM
+
+if __name__ == '__main__':
+    print(get_string_info_from_declarative_base(SimpleDBM))

arpakitlib-1.8.10/arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_model/common.py

@@ -0,0 +1,42 @@
+from datetime import datetime
+
+import sqlalchemy
+from sqlalchemy import func
+from sqlalchemy.orm import mapped_column, Mapped
+
+from arpakitlib.ar_datetime_util import now_utc_dt
+from arpakitlib.ar_sqlalchemy_util import get_string_info_from_declarative_base, BaseDBM
+from project.sqlalchemy_db_.util import generate_default_long_id
+
+
+class SimpleDBM(BaseDBM):
+    __abstract__ = True
+
+    id: Mapped[int] = mapped_column(
+        sqlalchemy.INTEGER, primary_key=True, autoincrement=True, sort_order=-13, nullable=False
+    )
+    long_id: Mapped[str] = mapped_column(
+        sqlalchemy.TEXT, insert_default=generate_default_long_id, server_default=func.gen_random_uuid(),
+        unique=True, sort_order=-12, nullable=False
+    )
+    slug: Mapped[str | None] = mapped_column(
+        sqlalchemy.TEXT, unique=True, sort_order=-11, nullable=True
+    )
+    creation_dt: Mapped[datetime] = mapped_column(
+        sqlalchemy.TIMESTAMP(timezone=True), insert_default=now_utc_dt, server_default=func.now(),
+        index=True, sort_order=-10, nullable=False
+    )
+
+    def __repr__(self) -> str:
+        if self.slug is None:
+            return f"{self.__class__.__name__.removesuffix('DBM')} (id={self.id})"
+        return f"{self.__class__.__name__.removesuffix('DBM')} (id={self.id}, slug={self.slug})"
+
+
+def get_simple_dbm_class() -> type[SimpleDBM]:
+    from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
+    return SimpleDBM
+
+
+if __name__ == '__main__':
+    print(get_string_info_from_declarative_base(get_simple_dbm_class()))

arpakitlib-1.8.8/arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_model.py → arpakitlib-1.8.10/arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_model/operation.py

@@ -1,61 +1,17 @@
+from __future__ import annotations
+
 from datetime import datetime, timedelta
-from typing import Any
+from typing import Any, TYPE_CHECKING
 
 import sqlalchemy
-from sqlalchemy import func
 from sqlalchemy.dialects import postgresql
 from sqlalchemy.orm import mapped_column, Mapped
 
-from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_enumeration_util import Enumeration
-from arpakitlib.ar_sqlalchemy_util import get_string_info_from_declarative_base, BaseDBM
-from project.sqlalchemy_db_.util import generate_default_long_id
-
-
-class SimpleDBM(BaseDBM):
-    __abstract__ = True
-
-    id: Mapped[int] = mapped_column(
-        sqlalchemy.INTEGER, primary_key=True, autoincrement=True, sort_order=-13, nullable=False
-    )
-    long_id: Mapped[str] = mapped_column(
-        sqlalchemy.TEXT, insert_default=generate_default_long_id, server_default=func.gen_random_uuid(),
-        unique=True, sort_order=-12, nullable=False
-    )
-    slug: Mapped[str | None] = mapped_column(
-        sqlalchemy.TEXT, unique=True, sort_order=-11, nullable=True
-    )
-    creation_dt: Mapped[datetime] = mapped_column(
-        sqlalchemy.TIMESTAMP(timezone=True), insert_default=now_utc_dt, server_default=func.now(),
-        index=True, sort_order=-10, nullable=False
-    )
+from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
 
-    def __repr__(self) -> str:
-        if self.slug is None:
-            return f"{self.__class__.__name__.removesuffix('DBM')} (id={self.id})"
-        return f"{self.__class__.__name__.removesuffix('DBM')} (id={self.id}, slug={self.slug})"
-
-
-class StoryLogDBM(SimpleDBM):
-    __tablename__ = "story_log"
-
-    class Levels(Enumeration):
-        info = "info"
-        warning = "warning"
-        error = "error"
-
-    class Types(Enumeration):
-        error_in_execute_operation = "error_in_execute_operation"
-        error_in_api_route = "error_in_api_route"
-
-    level: Mapped[str] = mapped_column(
-        sqlalchemy.TEXT, insert_default=Levels.info, server_default=Levels.info, index=True, nullable=False
-    )
-    type: Mapped[str | None] = mapped_column(sqlalchemy.TEXT, index=True, default=None, nullable=True)
-    title: Mapped[str | None] = mapped_column(sqlalchemy.TEXT, index=True, default=None, nullable=True)
-    data: Mapped[dict[str, Any]] = mapped_column(
-        postgresql.JSON, insert_default={}, server_default="{}", nullable=False
-    )
+if TYPE_CHECKING:
+    pass
 
 
 class OperationDBM(SimpleDBM):
@@ -69,7 +25,7 @@ class OperationDBM(SimpleDBM):
 
     class Types(Enumeration):
         healthcheck_ = "healthcheck"
-        raise_fake_error_ = "raise_fake_error_"
+        raise_fake_error_ = "raise_fake_error"
 
     status: Mapped[str] = mapped_column(
         sqlalchemy.TEXT, index=True, insert_default=Statuses.waiting_for_execution,
@@ -78,6 +34,7 @@ class OperationDBM(SimpleDBM):
     type: Mapped[str] = mapped_column(
         sqlalchemy.TEXT, index=True, insert_default=Types.healthcheck_, nullable=False
     )
+    title: Mapped[str | None] = mapped_column(sqlalchemy.TEXT, insert_default=None, nullable=True)
     execution_start_dt: Mapped[datetime | None] = mapped_column(sqlalchemy.TIMESTAMP(timezone=True), nullable=True)
     execution_finish_dt: Mapped[datetime | None] = mapped_column(sqlalchemy.TIMESTAMP(timezone=True), nullable=True)
     input_data: Mapped[dict[str, Any]] = mapped_column(
@@ -87,10 +44,16 @@ class OperationDBM(SimpleDBM):
         nullable=False
     )
     output_data: Mapped[dict[str, Any]] = mapped_column(
-        postgresql.JSON, insert_default={}, server_default="{}", nullable=False
+        postgresql.JSON,
+        insert_default={},
+        server_default="{}",
+        nullable=False
     )
     error_data: Mapped[dict[str, Any]] = mapped_column(
-        postgresql.JSON, insert_default={}, server_default="{}", nullable=False
+        postgresql.JSON,
+        insert_default={},
+        server_default="{}",
+        nullable=False
     )
 
     def raise_if_executed_with_error(self):
@@ -119,16 +82,12 @@ class OperationDBM(SimpleDBM):
 
     @property
     def sdp_duration_total_seconds(self) -> float | None:
+        """
+        При использовании у данной модели .simple_dict данное свойство будет представлено как поле.
+        То есть префикс sdp_ и даёт этот бонус.
+        """
         return self.duration_total_seconds
 
 
-def get_simple_dbm() -> type[SimpleDBM]:
-    return SimpleDBM
-
-
-def import_sqlalchemy_models():
-    pass
-
-
-if __name__ == '__main__':
-    print(get_string_info_from_declarative_base(SimpleDBM))
+def get_operation_dbm_class() -> type[OperationDBM]:
+    return OperationDBM

arpakitlib-1.8.10/arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/sqlalchemy_model/story_log.py

@@ -0,0 +1,39 @@
+from __future__ import annotations
+
+from typing import Any, TYPE_CHECKING
+
+import sqlalchemy
+from sqlalchemy.dialects import postgresql
+from sqlalchemy.orm import mapped_column, Mapped
+
+from arpakitlib.ar_enumeration_util import Enumeration
+from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
+
+if TYPE_CHECKING:
+    pass
+
+
+class StoryLogDBM(SimpleDBM):
+    __tablename__ = "story_log"
+
+    class Levels(Enumeration):
+        info = "info"
+        warning = "warning"
+        error = "error"
+
+    class Types(Enumeration):
+        error_in_execute_operation = "error_in_execute_operation"
+        error_in_api_route = "error_in_api_route"
+
+    level: Mapped[str] = mapped_column(
+        sqlalchemy.TEXT, insert_default=Levels.info, server_default=Levels.info, index=True, nullable=False
+    )
+    type: Mapped[str | None] = mapped_column(sqlalchemy.TEXT, index=True, insert_default=None, nullable=True)
+    title: Mapped[str | None] = mapped_column(sqlalchemy.TEXT, insert_default=None, nullable=True)
+    data: Mapped[dict[str, Any]] = mapped_column(
+        postgresql.JSON, insert_default={}, server_default="{}", nullable=False
+    )
+
+
+def get_story_log_dbm_class() -> type[StoryLogDBM]:
+    return StoryLogDBM

{arpakitlib-1.8.8 → arpakitlib-1.8.10}/arpakitlib/ar_sqlalchemy_util.py

@@ -57,6 +57,8 @@ def generate_sqlalchemy_url(
 
 class BaseDBM(DeclarativeBase):
     __abstract__ = True
+    __table_args__ = {"extend_existing": True}
+
     _bus_data: dict[str, Any] | None = None
 
     @property
@@ -102,7 +104,7 @@ class BaseDBM(DeclarativeBase):
     def simple_dict_with_sd_properties(self) -> dict[str, Any]:
         return self.simple_dict(include_sd_properties=True)
 
-    def simple_json(self, *, include_sd_properties: bool = True) -> str:
+    def simple_dict_json(self, *, include_sd_properties: bool = True) -> str:
         return safely_transfer_obj_to_json_str(self.simple_dict(include_sd_properties=include_sd_properties))
 
 

{arpakitlib-1.8.8 → arpakitlib-1.8.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.8"
+version = "1.8.10"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_support", email = "support@arpakit.com" }