cs-models 0.0.685__py3-none-any.whl → 0.0.687__py3-none-any.whl

cs_models/resources/AssistantCommand/models.py

@@ -42,6 +42,7 @@ class AssistantCommandModel(Base):
     label = Column(Text, nullable=False)
     result = Column(Text)
     llm_result = Column(Text)
+    error = Column(Text, nullable=True)
     internal_doc = Column(Boolean, nullable=True)
     created_at = Column(DateTime, nullable=False, default=lambda: datetime.utcnow())
     updated_at = Column(

cs_models/resources/AssistantCommand/schemas.py

@@ -103,6 +103,7 @@ class AssistantCommandResourceSchema(Schema):
     lower_neighbour_ids = fields.Method(serialize="serialize_lower_neighbours")
     result = AssistantCommandResultField(required=True, allow_none=True)
     llm_result = AssistantCommandLLMResultField(allow_none=True)
+    error = fields.String(allow_none=True)
     internal_doc = fields.Boolean(allow_none=True)
     created_at = fields.DateTime(dump_only=True)
     updated_at = fields.DateTime(dump_only=True)

cs_models/resources/SmartGridCell/models.py

@@ -10,11 +10,6 @@ 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)
@@ -33,13 +28,6 @@ class SmartGridCellModel(Base):
         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

@@ -7,7 +7,6 @@ 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)

cs_models/resources/WorkbookBlock/models.py

@@ -5,7 +5,6 @@ from sqlalchemy.orm import relationship
 
 from ...database import Base
 from ..WorkbookBlockComment.models import WorkbookBlockCommentModel
-from ..SmartGridCell.models import SmartGridCellModel
 
 
 class WorkbookBlockModel(Base):
@@ -44,10 +43,3 @@ 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,9 +4,6 @@ from marshmallow import Schema, fields
 from ..WorkbookBlockComment.schemas import (
     WorkbookBlockCommentResourceSchema,
 )
-from ..SmartGridCell.schemas import (
-    SmartGridCellResourceSchema
-)
 
 
 class WorkbookBlockDataField(fields.Field):
@@ -60,11 +57,6 @@ class WorkbookBlockResourceSchema(Schema):
         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.685.dist-info → cs_models-0.0.687.dist-info}/METADATA

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

{cs_models-0.0.685.dist-info → cs_models-0.0.687.dist-info}/RECORD

@@ -27,8 +27,8 @@ cs_models/resources/Assignee/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 cs_models/resources/Assignee/models.py,sha256=_f0_UwzF1gbOlU0t0l-9UIi0E4vaIS5VsHeOxc698SE,617
 cs_models/resources/Assignee/schemas.py,sha256=N4_upICR1Cd_B45LHpOly7FEwWhAB1fXUP4y60OiezE,269
 cs_models/resources/AssistantCommand/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cs_models/resources/AssistantCommand/models.py,sha256=_23uhE2O5XeaTiLgHdfnswqv1-lkLJ_qi6mTxsfrmGE,2115
-cs_models/resources/AssistantCommand/schemas.py,sha256=HxJQHLD8WolXkS4r-VBymxWs9QuYaFBX1c2NIF2CobQ,3746
+cs_models/resources/AssistantCommand/models.py,sha256=qZ5yGM-BCIIT-Kh5cFcbNVMNtunV7BLwfRsgGzyaSdg,2155
+cs_models/resources/AssistantCommand/schemas.py,sha256=miJ9NXIKYK4p0Oke5N3kEVuFI8uUZwGLVKb0UWcNlEw,3789
 cs_models/resources/AssistantCommandArtifact/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/AssistantCommandArtifact/models.py,sha256=SxSjZA_y2SGzXv7YW-19-rCTzRBcUiPf5JzMK1B-xRg,808
 cs_models/resources/AssistantCommandArtifact/schemas.py,sha256=fNOCH2oS0gUsGZtgpKeYPc4-xJhODw2HidHV3C12tGo,414
@@ -870,8 +870,8 @@ cs_models/resources/SearchLink/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 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=o7h-dzp2447Vxq_ioxz75Up6W84kZxbxo2oSoXfkOGQ,761
+cs_models/resources/SmartGridCell/models.py,sha256=qolCmQ7C2BUetYADV3Ju6V5EK-byFK3RWAwU1mtYOqk,987
+cs_models/resources/SmartGridCell/schemas.py,sha256=JVPfua3I14z8h79G5kRMjZYqsyyuyHM2rELSH3cc-Zc,716
 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
@@ -1090,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=VIC-_DVC4VQICdPZCMl_jfWwvLpgVfdb6go-TPdmakU,1999
-cs_models/resources/WorkbookBlock/schemas.py,sha256=yAcYHaQXD8KPV-cfKfv15ZqJwku8ANRj1INtve5KGSk,2054
+cs_models/resources/WorkbookBlock/models.py,sha256=hYZkSFR5p6nVMUbb6ZQxvXvB6XMPlgEDliBx_k0HZ40,1659
+cs_models/resources/WorkbookBlock/schemas.py,sha256=lRon0US-VHMOGypaiUSZsskgFpjNEtmFEk9nFU7DLnI,1847
 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
@@ -1141,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.685.dist-info/METADATA,sha256=-QaOaXV7G1wbUxt08LzGZLPaZHTjBVOZE9yw-rH2soA,792
-cs_models-0.0.685.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cs_models-0.0.685.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
-cs_models-0.0.685.dist-info/RECORD,,
+cs_models-0.0.687.dist-info/METADATA,sha256=PXS-r915dnRugLdc3Lb52hLTT_Bu5lpkkdiXoIGOfD0,792
+cs_models-0.0.687.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cs_models-0.0.687.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
+cs_models-0.0.687.dist-info/RECORD,,