cs-models 0.0.680__py3-none-any.whl → 0.0.682__py3-none-any.whl

cs_models/resources/AssistantUserQuery/models.py

@@ -1,7 +1,7 @@
 import enum
 from datetime import datetime
 
-from sqlalchemy import Column, DateTime, Enum, ForeignKey, Integer, String
+from sqlalchemy import Column, DateTime, Enum, ForeignKey, Integer, String, Text
 from sqlalchemy.orm import relationship
 
 from ...database import Base
@@ -29,8 +29,8 @@ class AssistantUserQueryModel(Base):
         nullable=False,
     )
     filter = Column(
-        String,
-        nullable=False,
+        Text,
+        nullable=True,
     )
     type = Column(
         String,

cs_models/resources/AssistantUserQuery/schemas.py

@@ -1,16 +1,54 @@
+import json
 from marshmallow import Schema, fields
-
 from .models import AssistantUserQueryStatusEnum
 from ..AssistantCommand.schemas import (
     AssistantCommandResourceSchema,
 )
 
 
+class AssistantUserQueryFilterField(fields.Field):
+    """Field that stores result for the Assistant command."""
+
+    def _serialize(self, value, attr, obj, **kwargs):
+        """
+        In the DB, the `result` field is a text field. We persist
+        data by performing the following:
+
+        AssistantCommandModel(
+            ...
+            result=json.dumps({...}),
+        )
+
+        So here we need to perform the inverse operation (i.e `json.loads(..)`)
+        """
+        if value is None:
+            return None
+        return json.loads(value)
+
+    def _deserialize(self, value, attr, data, **kwargs):
+        """
+        In the DB, the `result` field is a text field. We persist
+        data by performing the following:
+
+
+
+        AssistantCommandModel(
+            ***AssistantCommandResourceSchema().load({
+                ...
+                "result": [{"some_key": 1}, {"some_key": 2}],
+            }),
+        )
+        """
+        if value is None:
+            return None
+        return json.dumps(value)
+
+
 class AssistantUserQueryResourceSchema(Schema):
     id = fields.Integer(dump_only=True)
     session_id = fields.Integer(required=True)
     value = fields.String(required=True)
-    filter = fields.String(allow_none=True)
+    filter = AssistantUserQueryFilterField(allow_none=True)
     type = fields.String(required=True)
     status = fields.Enum(AssistantUserQueryStatusEnum, required=True, by_value=True)
     commands = fields.Nested(

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(

cs_models/resources/WorkbookBlock/schemas.py

@@ -50,8 +50,8 @@ 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,

{cs_models-0.0.680.dist-info → cs_models-0.0.682.dist-info}/METADATA

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

{cs_models-0.0.680.dist-info → cs_models-0.0.682.dist-info}/RECORD

@@ -59,8 +59,8 @@ cs_models/resources/AssistantSession/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 cs_models/resources/AssistantSession/models.py,sha256=_aWsZ71HFytf0ufekL_dGGECYKDPPzlRSPXAv9dR0rY,1417
 cs_models/resources/AssistantSession/schemas.py,sha256=v4orSJwiNDzmcjdUHoW9CZpkS7pxsUwEdQDUJpOqwg4,781
 cs_models/resources/AssistantUserQuery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cs_models/resources/AssistantUserQuery/models.py,sha256=9eegXJCIyum4cj42lxhLN2HAyRzd67musar_7fdMZus,1820
-cs_models/resources/AssistantUserQuery/schemas.py,sha256=kRe-GthQb73noGWdRg0xKTx6t0z1yWJputkux7VW7SI,760
+cs_models/resources/AssistantUserQuery/models.py,sha256=Je_-aQ702dWxQSTH398dspF8_glRCHtSA6_LdWLW410,1823
+cs_models/resources/AssistantUserQuery/schemas.py,sha256=ju2-XM9xdXCNwcFy0YDzJ0dH0Nj2BxTRZPqnItFZMVo,1819
 cs_models/resources/B3CRSS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/B3CRSS/models.py,sha256=rl538IgpQSzZu0FzpfxbDDCRWGkAGTpqcw9or5tMOg8,629
 cs_models/resources/B3CRSS/schemas.py,sha256=mArXYiVl15oEFaz9RLQ6WN68ueI0ec83NeLrNnP-sMM,346
@@ -1087,8 +1087,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=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
@@ -1138,7 +1138,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.680.dist-info/METADATA,sha256=pMVVXwcaCgaHRE_em5hTKwFdHlIZZtlBysXsEHMzG9k,792
-cs_models-0.0.680.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cs_models-0.0.680.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
-cs_models-0.0.680.dist-info/RECORD,,
+cs_models-0.0.682.dist-info/METADATA,sha256=6jOpW7GRHCi8l1M3fvGiv8ReFxaSlJ_3_Pju6m9ReMc,792
+cs_models-0.0.682.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cs_models-0.0.682.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
+cs_models-0.0.682.dist-info/RECORD,,