cs-models 0.0.681__py3-none-any.whl → 0.0.683__py3-none-any.whl

cs_models/resources/SmartGridCell/models.py

@@ -0,0 +1,45 @@
+from datetime import datetime
+
+from sqlalchemy import Column, DateTime, Boolean, ForeignKey, Integer, Text, String
+from sqlalchemy.orm import relationship
+
+from ...database import Base
+
+
+class SmartGridCellModel(Base):
+    __tablename__ = "smart_grid_cells"
+
+    id = Column(Integer, primary_key=True)
+    block_id = Column(
+        Integer,
+        ForeignKey("workbook_blocks.id"),
+        nullable=False,
+    )
+    row = Column(Integer, nullable=False)
+    col = Column(Integer, nullable=False)
+    type = Column(String(20), nullable=False)
+    data = Column(Text, nullable=True)
+    user_query_id = Column(
+        Integer,
+        ForeignKey("assistant_user_queries.id"),
+        nullable=True,
+    )
+    is_deleted = Column(Boolean, nullable=True)
+    updated_at = Column(
+        DateTime,
+        nullable=False,
+        # https://stackoverflow.com/questions/58776476/why-doesnt-freezegun-work-with-sqlalchemy-default-values
+        default=lambda: datetime.utcnow(),
+        onupdate=lambda: datetime.utcnow(),
+    )
+
+    # These are ORM fields. Don't need to be added in the corresponding migration.
+    # https://docs.sqlalchemy.org/en/14/orm/tutorial.html#building-a-relationship
+    workbook_block = relationship(
+        "WorkbookBlockModel",
+        back_populates="grid",
+    )
+
+    user_query = relationship(
+        "AssistantUserQueryModel",
+    )

cs_models/resources/SmartGridCell/schemas.py

@@ -0,0 +1,16 @@
+"""Marshmallow Schema for AssistantCommand."""
+from marshmallow import Schema, fields
+
+
+class SmartGridCellResourceSchema(Schema):
+    """Class for AssistantCommandResource schema"""
+
+    id = fields.Integer(dump_only=True)
+    block_id = fields.Integer(required=True)
+    row = fields.Integer(required=True)
+    col = fields.Integer(required=True)
+    type = fields.String(required=True)
+    data = fields.String(allow_none=True)
+    user_query_id = fields.Integer(allow_none=True)
+    is_deleted = fields.Boolean(allow_none=True)
+    updated_at = fields.DateTime(dump_only=True)

cs_models/resources/WorkbookBlock/models.py

@@ -17,8 +17,8 @@ class WorkbookBlockModel(Base):
         nullable=False,
     )
     sequence_number = Column(Integer, nullable=False)
-    block_type = Column(String(50), nullable=False)
-    block_data = Column(Text, nullable=True)
+    type = Column(String(50), nullable=False)
+    data = Column(Text, nullable=True)
     is_deleted = Column(Boolean, nullable=True)
     created_at = Column(DateTime, nullable=False, default=lambda: datetime.utcnow())
     updated_at = Column(
@@ -43,3 +43,10 @@ class WorkbookBlockModel(Base):
         order_by=WorkbookBlockCommentModel.sequence_number,
         back_populates="workbook_block",
     )
+
+    grid = relationship(
+        "SmartGridCellModel",
+        primaryjoin="and_(WorkbookBlockModel.id==SmartGridCellModel.block_id, "
+                    "or_(SmartGridCellModel.is_deleted==False, SmartGridCellModel.is_deleted==None))",
+        back_populates="workbook_block",
+    )

cs_models/resources/WorkbookBlock/schemas.py

@@ -4,6 +4,9 @@ from marshmallow import Schema, fields
 from ..WorkbookBlockComment.schemas import (
     WorkbookBlockCommentResourceSchema,
 )
+from ..SmartGridCell.schemas import (
+    SmartGridCellResourceSchema
+)
 
 
 class WorkbookBlockDataField(fields.Field):
@@ -50,13 +53,18 @@ class WorkbookBlockResourceSchema(Schema):
     id = fields.Integer(dump_only=True)
     workbook_id = fields.Integer(required=True)
     sequence_number = fields.Integer(required=True)
-    block_type = fields.String(required=True)
-    block_data = WorkbookBlockDataField(required=True, allow_none=True)
+    type = fields.String(required=True)
+    data = WorkbookBlockDataField(required=True, allow_none=True)
     comments = fields.Nested(
         WorkbookBlockCommentResourceSchema(exclude=("block_id",)),
         many=True,
         dump_only=True,
     )
+    grid = fields.Nested(
+        SmartGridCellResourceSchema(exclude=("block_id",)),
+        many=True,
+        dump_only=True,
+    )
     is_deleted = fields.Boolean(allow_none=True)
     created_at = fields.DateTime(dump_only=True)
     updated_at = fields.DateTime(dump_only=True)

{cs_models-0.0.681.dist-info → cs_models-0.0.683.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cs-models
-Version: 0.0.681
+Version: 0.0.683
 Summary: MySQL db models
 Home-page: https://github.com/mindgram/cs-models
 Author: Shrey Verma

{cs_models-0.0.681.dist-info → cs_models-0.0.683.dist-info}/RECORD

@@ -869,6 +869,9 @@ cs_models/resources/ScratchpadTable/schemas.py,sha256=pQPf6xpsg0ZKDM9xwesvrpdq8H
 cs_models/resources/SearchLink/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/SearchLink/models.py,sha256=l1tPCSKHK7Wq1OUWFH72NYncEt6Q3bR0P6ii7YKoxCM,729
 cs_models/resources/SearchLink/schemas.py,sha256=A8Y6LRgw7MHs9bihf0gZPfqp6KDm0Z8k6PJSL9WVxsc,448
+cs_models/resources/SmartGridCell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cs_models/resources/SmartGridCell/models.py,sha256=uFugY1RrzA7xl96YW_5DX3e6OH2s4A8UUd0AkSeI7oY,1367
+cs_models/resources/SmartGridCell/schemas.py,sha256=6bjs1Zy2TzQZzwCd6SVgreXef3iel5k9x_v4eGzBByQ,581
 cs_models/resources/Stream/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/Stream/models.py,sha256=wXb7yOjW82ZqmLhRcDhjLPk6_WJ5FGmvKpOcSvDMuBM,1884
 cs_models/resources/Stream/schemas.py,sha256=ZFsdEKINFGaSBUAcQQvilq5MKpYGliZseguQoc_opxk,3111
@@ -1087,8 +1090,8 @@ cs_models/resources/Workbook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 cs_models/resources/Workbook/models.py,sha256=4p2R8WCYYX0FOSXG0b2YhmuzKHTxYY4WZVi9X7e9GKQ,1003
 cs_models/resources/Workbook/schemas.py,sha256=xcNoPzHK6ER06XA3fAvX3x7VtX47aBP0vrIqiJvUVKw,688
 cs_models/resources/WorkbookBlock/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cs_models/resources/WorkbookBlock/models.py,sha256=F6qxBNuDe27Cma_wu75KmvEuDYrU2jHQvBvjtQG-5FI,1671
-cs_models/resources/WorkbookBlock/schemas.py,sha256=CfjGkuRff_ohR4WNSRKYkwpIrwPBvfuK9o21lNU3sWM,1859
+cs_models/resources/WorkbookBlock/models.py,sha256=jiVAA08dm6Im5X7yBZ2p31o8Ml_I_YUzRTKKQLgkOWg,1945
+cs_models/resources/WorkbookBlock/schemas.py,sha256=yAcYHaQXD8KPV-cfKfv15ZqJwku8ANRj1INtve5KGSk,2054
 cs_models/resources/WorkbookBlockComment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/WorkbookBlockComment/models.py,sha256=t1dLdweoPOzld1uBqrGJ3rrr66UkMwdiplNZEA1WtPU,1251
 cs_models/resources/WorkbookBlockComment/schemas.py,sha256=9UI_mTuPBYBk5qKUC2u0oR_clHA9XZ-bh5hhr24E-vs,563
@@ -1138,7 +1141,7 @@ cs_models/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/utils/alchemy.py,sha256=fhINGFn41owJ2DLXQKXAAtLqeZ1BRzD_qU0wPK_bsGQ,1598
 cs_models/utils/utils.py,sha256=bY623DuzycfPQiaOQT2AxfANeWfwr5w76dBuQ813-ns,3664
 cs_models/utils/profiling/__init__.py,sha256=N-73vb0M92C975fxgXyBCBjCPELl8Oh21ZY_-tzDnns,569
-cs_models-0.0.681.dist-info/METADATA,sha256=MMmOvmkbDD3LH9MTcyv3swU1GXvG8Uy7am_WjlumBEA,792
-cs_models-0.0.681.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cs_models-0.0.681.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
-cs_models-0.0.681.dist-info/RECORD,,
+cs_models-0.0.683.dist-info/METADATA,sha256=Vhnswq6AzPfR92ZnH1kY1qY-1MG8dIWh_hUvWoxPbaU,792
+cs_models-0.0.683.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cs_models-0.0.683.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
+cs_models-0.0.683.dist-info/RECORD,,