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

cs_models/resources/AssistantCommand/models.py

@@ -1,7 +1,7 @@
 import enum
 from datetime import datetime
 
-from sqlalchemy import Column, DateTime, Enum, ForeignKey, Integer, Text
+from sqlalchemy import Column, DateTime, Enum, ForeignKey, Integer, Text, Boolean
 from sqlalchemy.orm import relationship
 
 from ...database import Base
@@ -42,6 +42,7 @@ class AssistantCommandModel(Base):
     label = Column(Text, nullable=False)
     result = Column(Text)
     llm_result = Column(Text)
+    internal_doc = Column(Boolean, nullable=True)
     created_at = Column(DateTime, nullable=False, default=lambda: datetime.utcnow())
     updated_at = Column(
         DateTime,

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)
+    internal_doc = fields.Boolean(allow_none=True)
     created_at = fields.DateTime(dump_only=True)
     updated_at = fields.DateTime(dump_only=True)
 

cs_models/resources/SearchLink/models.py

@@ -0,0 +1,29 @@
+from datetime import datetime
+
+from sqlalchemy import (
+    Column,
+    Integer,
+    DateTime,
+    Text,
+    String,
+    Boolean,
+)
+
+from ...database import Base
+
+
+class SearchLinkModel(Base):
+    __tablename__ = "search_links"
+
+    id = Column(Integer, primary_key=True)
+    user_id = Column(String(128), nullable=False)
+    type = Column(String(50), nullable=False)
+    payload = Column(Text, nullable=True)
+    is_active = 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(),
+    )

cs_models/resources/SearchLink/schemas.py

@@ -0,0 +1,16 @@
+from marshmallow import (
+    Schema,
+    fields,
+    validate,
+)
+
+
+class SearchLinkResourceSchema(Schema):
+    not_blank = validate.Length(min=1, error='Field cannot be blank')
+
+    id = fields.Integer(dump_only=True)
+    user_id = fields.String(required=True, validate=not_blank)
+    type = fields.String(required=True)
+    payload = fields.String(required=True)
+    is_active = fields.Boolean(allow_none=True)
+    updated_at = fields.DateTime()

cs_models/resources/Workbook/models.py

@@ -28,6 +28,8 @@ class WorkbookModel(Base):
 
     blocks = relationship(
         "WorkbookBlockModel",
+        primaryjoin="and_(WorkbookModel.id==WorkbookBlockModel.workbook_id, "
+                    "or_(WorkbookBlockModel.is_deleted==False, WorkbookBlockModel.is_deleted==None))",
         order_by=WorkbookBlockModel.sequence_number,
         back_populates="workbook",
     )

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/models.py

@@ -38,6 +38,8 @@ class WorkbookBlockModel(Base):
 
     comments = relationship(
         "WorkbookBlockCommentModel",
+        primaryjoin="and_(WorkbookBlockModel.id==WorkbookBlockCommentModel.block_id, "
+                    "or_(WorkbookBlockCommentModel.is_deleted==False, WorkbookBlockCommentModel.is_deleted==None))",
         order_by=WorkbookBlockCommentModel.sequence_number,
         back_populates="workbook_block",
     )

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.673.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cs-models
-Version: 0.0.667
+Version: 0.0.673
 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.673.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=pcUVYIxI6EtbJphk1umNbdWQPt_Bul0kvUWNGqwO5Q4,2056
-cs_models/resources/AssistantCommand/schemas.py,sha256=7mS-WTHwPsu8Kd_0FLgJqYwrg0qVJUp7iioWqPT1ZBE,3695
+cs_models/resources/AssistantCommand/models.py,sha256=_23uhE2O5XeaTiLgHdfnswqv1-lkLJ_qi6mTxsfrmGE,2115
+cs_models/resources/AssistantCommand/schemas.py,sha256=HxJQHLD8WolXkS4r-VBymxWs9QuYaFBX1c2NIF2CobQ,3746
 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
@@ -866,6 +866,9 @@ cs_models/resources/SalesProductsMap/schemas.py,sha256=zocpRe3by4_wUKwy-Cp2I190-
 cs_models/resources/ScratchpadTable/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/ScratchpadTable/models.py,sha256=JGjzIMa-IaVDCk512G8nX3QgmfcvbQwCR91F6ykNA74,888
 cs_models/resources/ScratchpadTable/schemas.py,sha256=pQPf6xpsg0ZKDM9xwesvrpdq8HwpvXXzWpEPvxw8BBU,505
+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/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
@@ -1051,11 +1054,11 @@ cs_models/resources/Watchlist/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 cs_models/resources/Watchlist/models.py,sha256=YpuJCjfZvgtK_uHJieJGAyIeC-B1Zxb-whCEKvHfsf8,1173
 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/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=tYxYRt6210QdvgUldtmy3p3-srlVuEBZU2yCT01Xnag,1467
-cs_models/resources/WorkbookBlock/schemas.py,sha256=ETbgr7qkpVlX-A0r6aTnDoRLyfoveYMvoQ1KrO3aRAc,565
+cs_models/resources/WorkbookBlock/models.py,sha256=F6qxBNuDe27Cma_wu75KmvEuDYrU2jHQvBvjtQG-5FI,1671
+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 +1108,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.673.dist-info/METADATA,sha256=GFuWOnHtnEeFaBay6TNHSWsgLfDpDh0p1wpDSuPaGHo,792
+cs_models-0.0.673.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cs_models-0.0.673.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
+cs_models-0.0.673.dist-info/RECORD,,