nedvision-shared-models 1.2.0__tar.gz → 1.2.2__tar.gz

{nedvision_shared_models-1.2.0 → nedvision_shared_models-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nedvision-shared-models
-Version: 1.2.0
+Version: 1.2.2
 Summary: Nedvision shared SQLAlchemy models and alembic migrations entrypoint
 Requires-Python: >=3.13
 Requires-Dist: alembic>=1.18.4

{nedvision_shared_models-1.2.0 → nedvision_shared_models-1.2.2}/nedvision_shared_models.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nedvision-shared-models
-Version: 1.2.0
+Version: 1.2.2
 Summary: Nedvision shared SQLAlchemy models and alembic migrations entrypoint
 Requires-Python: >=3.13
 Requires-Dist: alembic>=1.18.4

{nedvision_shared_models-1.2.0 → nedvision_shared_models-1.2.2}/nedvision_shared_models.egg-info/SOURCES.txt

@@ -279,6 +279,8 @@ shared_models/alembic/versions/2026_06_30_2259-21093414f0f1_remove_table_pipelin
 shared_models/alembic/versions/2026_07_08_1116-7d29be8b50a2_create_tables_geoanalytics.py
 shared_models/alembic/versions/2026_07_08_1728-a29c767e9c15_feat_add_table_my_objects_analytics.py
 shared_models/alembic/versions/2026_07_10_1051-3373fe2f28c5_create_tables_geoanalytics.py
+shared_models/alembic/versions/2026_07_14_1234-8b110bef9696_add_table_analytics_source_data_and_.py
+shared_models/alembic/versions/2026_07_16_0123-d0eb7b1edb40_add_field_status_to_analytics.py
 shared_models/enums/__init__.py
 shared_models/enums/feature.py
 shared_models/enums/image.py
@@ -305,6 +307,7 @@ shared_models/mixins/uuid_mixin.py
 shared_models/models/__init__.py
 shared_models/models/action.py
 shared_models/models/advertisement.py
+shared_models/models/analytics_source_data.py
 shared_models/models/answer.py
 shared_models/models/answer_collection.py
 shared_models/models/assistant_collections.py

{nedvision_shared_models-1.2.0 → nedvision_shared_models-1.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nedvision-shared-models"
-version = "1.2.0"
+version = "1.2.2"
 description = "Nedvision shared SQLAlchemy models and alembic migrations entrypoint"
 requires-python = ">=3.13"
 dependencies = [

nedvision_shared_models-1.2.2/shared_models/alembic/versions/2026_07_14_1234-8b110bef9696_add_table_analytics_source_data_and_.py

@@ -0,0 +1,101 @@
+"""add table: analytics_source_data and fields
+
+Revision ID: 8b110bef9696
+Revises: 3373fe2f28c5
+Create Date: 2026-07-14 12:34:57.288454
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = "8b110bef9696"
+down_revision: Union[str, None] = "3373fe2f28c5"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "analytics_source_data",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("my_object_id", sa.UUID(), nullable=False),
+        sa.Column(
+            "source_data",
+            postgresql.JSONB(astext_type=sa.Text()),
+            nullable=True,
+        ),
+        sa.Column(
+            "created_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.text("timezone('UTC', now())"),
+            nullable=False,
+        ),
+        sa.Column(
+            "updated_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.text("timezone('UTC', now())"),
+            nullable=False,
+        ),
+        sa.ForeignKeyConstraint(
+            ["my_object_id"], ["my_objects.id"], ondelete="CASCADE"
+        ),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint("my_object_id"),
+    )
+
+    op.add_column(
+        "my_objects_analytics",
+        sa.Column(
+            "price_m2_data",
+            postgresql.JSONB(astext_type=sa.Text()),
+            nullable=True,
+        ),
+    )
+    op.add_column(
+        "my_objects_analytics",
+        sa.Column(
+            "rental_rate_data",
+            postgresql.JSONB(astext_type=sa.Text()),
+            nullable=True,
+        ),
+    )
+    op.add_column(
+        "my_objects_analytics",
+        sa.Column(
+            "payback_data",
+            postgresql.JSONB(astext_type=sa.Text()),
+            nullable=True,
+        ),
+    )
+    op.add_column(
+        "my_objects_analytics",
+        sa.Column(
+            "m2_revenue_month_data",
+            postgresql.JSONB(astext_type=sa.Text()),
+            nullable=True,
+        ),
+    )
+    op.add_column(
+        "my_objects_analytics",
+        sa.Column("offered_price", sa.Float(), nullable=True),
+    )
+    op.create_unique_constraint(None, "my_objects_analytics", ["my_object_id"])
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, "my_objects_analytics", type_="unique")
+    op.drop_column("my_objects_analytics", "offered_price")
+    op.drop_column("my_objects_analytics", "m2_revenue_month_data")
+    op.drop_column("my_objects_analytics", "payback_data")
+    op.drop_column("my_objects_analytics", "rental_rate_data")
+    op.drop_column("my_objects_analytics", "price_m2_data")
+    op.drop_table("analytics_source_data")
+    # ### end Alembic commands ###

nedvision_shared_models-1.2.2/shared_models/alembic/versions/2026_07_16_0123-d0eb7b1edb40_add_field_status_to_analytics.py

@@ -0,0 +1,41 @@
+"""add field status to analytics
+
+Revision ID: d0eb7b1edb40
+Revises: 8b110bef9696
+Create Date: 2026-07-16 01:23:58.019976
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = "d0eb7b1edb40"
+down_revision: Union[str, None] = "8b110bef9696"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.execute("CREATE TYPE myobjectanalyticsstatus AS ENUM ('PROCESSING', 'COMPLETED')")
+    op.add_column(
+        "my_objects_analytics",
+        sa.Column(
+            "status",
+            sa.Enum("PROCESSING", "COMPLETED", name="myobjectanalyticsstatus"),
+            server_default="PROCESSING",
+            nullable=False,
+        ),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("my_objects_analytics", "status")
+    op.execute("DROP TYPE myobjectanalyticsstatus")
+    # ### end Alembic commands ###

{nedvision_shared_models-1.2.0 → nedvision_shared_models-1.2.2}/shared_models/enums/__init__.py

@@ -15,6 +15,7 @@ __all__ = (
     "ImageType",
     "SubscriptionCode",
     "MyObjectStatus",
+    "MyObjectAnalyticsStatus",
 )
 
 from .image import ImageType
@@ -31,4 +32,4 @@ from .transaction_status import TransactionStatus
 from .transaction_type import TransactionType
 from .txn_batch_status import TransactionBatchStatus
 from .txn_batch_type import TransactionBatchType
-from .my_object_status import MyObjectStatus
+from .my_object_status import MyObjectStatus, MyObjectAnalyticsStatus

{nedvision_shared_models-1.2.0 → nedvision_shared_models-1.2.2}/shared_models/enums/my_object_status.py

@@ -6,3 +6,9 @@ class MyObjectStatus(Enum):
     READY_FOR_PUBLIC = "READY_FOR_PUBLIC"
     PUBLISHED = "PUBLISHED"
     ARCHIVE = "ARCHIVE"
+
+
+class MyObjectAnalyticsStatus(Enum):
+    PROCESSING = "PROCESSING"
+    COMPLETED = "COMPLETED"
+

{nedvision_shared_models-1.2.0 → nedvision_shared_models-1.2.2}/shared_models/models/__init__.py

@@ -80,11 +80,13 @@ __all__ = (
     "GeoAnalyticsRegionGeometry",
     "GeoAnalyticsHexagonRegion",
     "GeoAnalyticsObjectRegion",
+    "AnalyticsSourceData",
 )
 
 from .action import Action
 from .advertisement import Advertisement
 from .assistant_collections import AssistantCollection
+from .analytics_source_data import AnalyticsSourceData
 from .avg_data import AvgData
 from .bad_objects import BadObject
 from .cad_data import CadData

nedvision_shared_models-1.2.2/shared_models/models/analytics_source_data.py

@@ -0,0 +1,29 @@
+from __future__ import annotations
+
+from uuid import UUID
+from typing import TYPE_CHECKING
+
+from sqlalchemy import ForeignKey
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy.dialects.postgresql import JSONB
+
+from shared_models.mixins import IdMixin, TimestampZoneMixin
+from .base import Base
+
+if TYPE_CHECKING:
+    from . import MyObject
+
+
+class AnalyticsSourceData(Base, IdMixin, TimestampZoneMixin):
+    __tablename__ = "analytics_source_data"
+
+    my_object_id: Mapped[UUID] = mapped_column(
+        ForeignKey("my_objects.id", ondelete="CASCADE"),
+        unique=True,
+        nullable=False,
+    )
+
+    source_data: Mapped[dict] = mapped_column(JSONB, nullable=True)
+
+    # Связь
+    my_object: Mapped[MyObject] = relationship(back_populates="analytics_source_data")

{nedvision_shared_models-1.2.0 → nedvision_shared_models-1.2.2}/shared_models/models/geoanalytics_region.py

@@ -10,10 +10,10 @@ from shared_models.mixins import UUIDMixin, TimestampZoneMixin
 
 from .base import Base
 
-if TYPE_CHECKING:
-    from .geoanalytics_region_geometry import GeoAnalyticsRegionGeometry
-    from .geoanalytics_hexagon_region import GeoAnalyticsHexagonRegion
-    from .geoanalytics_object_region import GeoAnalyticsObjectRegion
+if TYPE_CHECKING:
+    from .geoanalytics_region_geometry import GeoAnalyticsRegionGeometry
+    from .geoanalytics_hexagon_region import GeoAnalyticsHexagonRegion
+    from .geoanalytics_object_region import GeoAnalyticsObjectRegion
 
 
 class GeoAnalyticsRegion(UUIDMixin, TimestampZoneMixin, Base):
@@ -31,18 +31,18 @@ class GeoAnalyticsRegion(UUIDMixin, TimestampZoneMixin, Base):
         uselist=False,
     )
 
-    hexagon_links: Mapped[list[GeoAnalyticsHexagonRegion]] = relationship(
-        back_populates="region",
-        cascade="all, delete-orphan",
-        passive_deletes=True,
-    )
-    object_links: Mapped[list[GeoAnalyticsObjectRegion]] = relationship(
-        back_populates="region",
-        cascade="all, delete-orphan",
-        passive_deletes=True,
-    )
-
-    __table_args__ = (
+    hexagon_links: Mapped[list[GeoAnalyticsHexagonRegion]] = relationship(
+        back_populates="region",
+        cascade="all, delete-orphan",
+        passive_deletes=True,
+    )
+    object_links: Mapped[list[GeoAnalyticsObjectRegion]] = relationship(
+        back_populates="region",
+        cascade="all, delete-orphan",
+        passive_deletes=True,
+    )
+
+    __table_args__ = (
         Index("idx_geoanalytics_regions_region_type", "region_type"),
         Index("idx_geoanalytics_regions_osm_ref", "osm_ref"),
     )

{nedvision_shared_models-1.2.0 → nedvision_shared_models-1.2.2}/shared_models/models/my_object.py

@@ -12,7 +12,7 @@ from shared_models.enums import MyObjectStatus
 from .base import Base
 
 if TYPE_CHECKING:
-    from . import ObjectData, User, MyObjectsData, MyObjectsAnalytics
+    from . import ObjectData, User, MyObjectsData, MyObjectsAnalytics, AnalyticsSourceData
 
 
 class MyObject(UUIDMixin, Base, TimestampZoneMixin):
@@ -34,4 +34,5 @@ class MyObject(UUIDMixin, Base, TimestampZoneMixin):
     user: Mapped[User] = relationship(back_populates="my_objects")
     object_data: Mapped[ObjectData] = relationship(back_populates="my_object")
     my_object_data: Mapped[MyObjectsData] = relationship(back_populates="my_object")
-    my_object_analytics: Mapped[list[MyObjectsAnalytics]] = relationship(back_populates="my_object")
+    my_object_analytics: Mapped[MyObjectsAnalytics] = relationship(back_populates="my_object")
+    analytics_source_data: Mapped[AnalyticsSourceData] = relationship(back_populates="my_object")

{nedvision_shared_models-1.2.0 → nedvision_shared_models-1.2.2}/shared_models/models/my_object_analytics.py

@@ -3,11 +3,12 @@ from __future__ import annotations
 from uuid import UUID
 from typing import TYPE_CHECKING
 
-from sqlalchemy import ForeignKey, JSON, Text
+from sqlalchemy import ForeignKey
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 from sqlalchemy.dialects.postgresql import JSONB
 
 from shared_models.mixins import IdMixin, TimestampZoneMixin
+from shared_models.enums import MyObjectAnalyticsStatus
 from .base import Base
 
 if TYPE_CHECKING:
@@ -19,6 +20,7 @@ class MyObjectsAnalytics(Base, IdMixin, TimestampZoneMixin):
 
     my_object_id: Mapped[UUID] = mapped_column(
         ForeignKey("my_objects.id", ondelete="CASCADE"),
+        unique=True,
         nullable=False,
     )
 
@@ -42,5 +44,17 @@ class MyObjectsAnalytics(Base, IdMixin, TimestampZoneMixin):
     traffic_points_map_image: Mapped[str] = mapped_column(nullable=True)
     traffic_magnets_points_map_image: Mapped[str] = mapped_column(nullable=True)
 
+    # Main-аналитика
+    price_m2_data: Mapped[dict] = mapped_column(JSONB, nullable=True)
+    rental_rate_data: Mapped[dict] = mapped_column(JSONB, nullable=True)
+    payback_data: Mapped[dict] = mapped_column(JSONB, nullable=True)
+    m2_revenue_month_data: Mapped[dict] = mapped_column(JSONB, nullable=True)
+    offered_price: Mapped[float] = mapped_column(nullable=True)
+
+    status: Mapped[MyObjectAnalyticsStatus] = mapped_column(
+        default=MyObjectAnalyticsStatus.PROCESSING,
+        server_default=MyObjectAnalyticsStatus.PROCESSING.value,
+    )
+
     # Связь
     my_object: Mapped[MyObject] = relationship(back_populates="my_object_analytics")

{nedvision_shared_models-1.2.0 → nedvision_shared_models-1.2.2}/shared_models/models/object.py

@@ -12,13 +12,13 @@ from ..enums import Profile
 from .base import Base
 
 if TYPE_CHECKING:
-    from . import (
-        Advertisement,
-        Economic,
-        GeoAnalyticsObjectRegion,
-        ObjectData,
-        Potential,
-        Region,
+    from . import (
+        Advertisement,
+        Economic,
+        GeoAnalyticsObjectRegion,
+        ObjectData,
+        Potential,
+        Region,
     )
 
 
@@ -97,18 +97,18 @@ class Object(IdMixin, TimestampMixin, Base):
     is_actual: Mapped[bool] = mapped_column(nullable=True)
     views: Mapped[int] = mapped_column(BIGINT, default=0, server_default="0")
 
-    regions: Mapped[list[Region]] = relationship(
-        secondary="object_region_association",
-        back_populates="objects",
-    )
-    geoanalytics_region_links: Mapped[list[GeoAnalyticsObjectRegion]] = relationship(
-        back_populates="object",
-        cascade="all, delete-orphan",
-        passive_deletes=True,
-    )
-
-    potential: Mapped[Potential] = relationship(
-        back_populates="object",
+    regions: Mapped[list[Region]] = relationship(
+        secondary="object_region_association",
+        back_populates="objects",
+    )
+    geoanalytics_region_links: Mapped[list[GeoAnalyticsObjectRegion]] = relationship(
+        back_populates="object",
+        cascade="all, delete-orphan",
+        passive_deletes=True,
+    )
+
+    potential: Mapped[Potential] = relationship(
+        back_populates="object",
     )
 
     economic: Mapped[Economic] = relationship(