cs-models 0.0.667__py3-none-any.whl → 0.0.669__py3-none-any.whl

cs_models/resources/Workbook/schemas.py

@@ -3,6 +3,9 @@ from marshmallow import (
     fields,
     validate,
 )
+from ..WorkbookBlock.schemas import (
+    WorkbookBlockResourceSchema,
+)
 
 
 class WorkbookResourceSchema(Schema):
@@ -11,6 +14,11 @@ class WorkbookResourceSchema(Schema):
     id = fields.Integer(dump_only=True)
     user_id = fields.String(required=True, validate=not_blank)
     workbook_name = fields.String(required=True)
+    blocks = fields.Nested(
+        WorkbookBlockResourceSchema(exclude=("workbook_id",)),
+        many=True,
+        dump_only=True,
+    )
     is_deleted = fields.Boolean(allow_none=True)
     created_at = fields.DateTime(required=True)
     updated_at = fields.DateTime(dump_only=True)

cs_models/resources/WorkbookBlock/schemas.py

@@ -1,5 +1,47 @@
 """Marshmallow Schema for AssistantCommand."""
+import json
 from marshmallow import Schema, fields
+from ..WorkbookBlockComment.schemas import (
+    WorkbookBlockCommentResourceSchema,
+)
+
+
+class WorkbookBlockDataField(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 WorkbookBlockResourceSchema(Schema):
@@ -9,7 +51,12 @@ class WorkbookBlockResourceSchema(Schema):
     workbook_id = fields.Integer(required=True)
     sequence_number = fields.Integer(required=True)
     block_type = fields.String(required=True)
-    block_data = fields.String(allow_none=True)
+    block_data = WorkbookBlockDataField(required=True, allow_none=True)
+    comments = fields.Nested(
+        WorkbookBlockCommentResourceSchema(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.667.dist-info → cs_models-0.0.669.dist-info}/METADATA

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

{cs_models-0.0.667.dist-info → cs_models-0.0.669.dist-info}/RECORD

@@ -1052,10 +1052,10 @@ cs_models/resources/Watchlist/models.py,sha256=YpuJCjfZvgtK_uHJieJGAyIeC-B1Zxb-w
 cs_models/resources/Watchlist/schemas.py,sha256=2VLCMjiOA73pp_mtjo9kmWpgpOuXOCmlSQNwe39s8qw,1818
 cs_models/resources/Workbook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/Workbook/models.py,sha256=6sj9VhKTCnBL32_pkwUqfE9ESBRu1oCL2cpQn7bxlv8,822
-cs_models/resources/Workbook/schemas.py,sha256=4gqGGN5KthKoqAYmL6QnRKMX-gGH-x61-XInNZQyTzM,475
+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=tYxYRt6210QdvgUldtmy3p3-srlVuEBZU2yCT01Xnag,1467
-cs_models/resources/WorkbookBlock/schemas.py,sha256=ETbgr7qkpVlX-A0r6aTnDoRLyfoveYMvoQ1KrO3aRAc,565
+cs_models/resources/WorkbookBlock/schemas.py,sha256=CfjGkuRff_ohR4WNSRKYkwpIrwPBvfuK9o21lNU3sWM,1859
 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
@@ -1105,7 +1105,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.667.dist-info/METADATA,sha256=O4BFF74Z3IJGYVtVAh0uqsndPymWSiNuN32o4pUCKd8,792
-cs_models-0.0.667.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cs_models-0.0.667.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
-cs_models-0.0.667.dist-info/RECORD,,
+cs_models-0.0.669.dist-info/METADATA,sha256=fUuZ7WjCpptkNy9CeIuG7goNdBkeFiWHXreJsy908xc,792
+cs_models-0.0.669.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cs_models-0.0.669.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
+cs_models-0.0.669.dist-info/RECORD,,