cs-models 0.0.710__py3-none-any.whl → 0.0.712__py3-none-any.whl

cs_models/resources/TableFigure/models.py

@@ -24,6 +24,7 @@ class TableFigureModel(Base):
     )
     source_type = Column(String(50), nullable=False)
     source_id = Column(Integer, nullable=False)
+    type = Column(String(50), nullable=False)
     label = Column(String(50), nullable=True)
     caption = Column(Text, nullable=True)
     description = Column(Text, nullable=True)

cs_models/resources/TableFigure/schemas.py

@@ -1,3 +1,4 @@
+import json
 from marshmallow import (
     Schema,
     fields,
@@ -5,6 +6,44 @@ from marshmallow import (
 )
 
 
+class TableFigureCaptionField(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 TableFigureResourceSchema(Schema):
     not_blank = validate.Length(min=1, error='Field cannot be blank')
 
@@ -12,8 +51,9 @@ class TableFigureResourceSchema(Schema):
     file_id = fields.Integer(required=True)
     source_type = fields.String(required=True)
     source_id = fields.Integer(required=True)
+    type = fields.String(required=True)
     label = fields.String(allow_none=True)
-    caption = fields.String(allow_none=True)
+    caption = TableFigureCaptionField(required=True, allow_none=True)
     description = fields.String(allow_none=True)
     content = fields.String(allow_none=True)
     link = fields.String(allow_none=True)

cs_models/resources/ViewPublicAssistantUserQuery/models.py

@@ -0,0 +1,30 @@
+from datetime import datetime
+
+from sqlalchemy import (
+    Column,
+    Integer,
+    DateTime,
+    ForeignKey,
+    Text,
+)
+
+from ...database import Base
+
+
+class ViewPublicAssistantUserQueryModel(Base):
+    __tablename__ = "_view_public_assistant_user_queries"
+
+    id = Column(Integer, primary_key=True)
+    user_query_id = Column(
+        Integer,
+        ForeignKey('assistant_user_queries.id'),
+        nullable=False,
+    )
+    data = Column(Text, 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/ViewPublicAssistantUserQuery/schemas.py

@@ -0,0 +1,14 @@
+from marshmallow import (
+    Schema,
+    fields,
+    validate,
+)
+
+
+class ViewPublicAssistantUserQueryResourceSchema(Schema):
+    not_blank = validate.Length(min=1, error='Field cannot be blank')
+
+    id = fields.Integer(dump_only=True)
+    user_query_id = fields.Integer(required=True)
+    data = fields.String(allow_none=True)
+    updated_at = fields.DateTime()

{cs_models-0.0.710.dist-info → cs_models-0.0.712.dist-info}/METADATA

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

{cs_models-0.0.710.dist-info → cs_models-0.0.712.dist-info}/RECORD

@@ -905,8 +905,8 @@ cs_models/resources/SubsidiarySponsorMapping/models.py,sha256=nzTbV96Dy25NmvFrWz
 cs_models/resources/SubsidiarySponsorMapping/schemas.py,sha256=RjiN4h8HMKsaGRVGWHrO_LdH6A5zzl2WfieEJJQv7I8,813
 cs_models/resources/SubsidiarySponsorMapping/test_subsidiary_sponsor_mapping.py,sha256=vMCJDohlOdZaUxMuAnqRy6hEUepc_EE-6nVElM8WUtY,5977
 cs_models/resources/TableFigure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cs_models/resources/TableFigure/models.py,sha256=9QDvBIetzIrJFtCFx8E6azow5n62vTxD0vsNR0X8EKc,1036
-cs_models/resources/TableFigure/schemas.py,sha256=VGt0vS84l8IXFG_qwbbCGZ-zqi8EhcqIixlCVCVv1z0,668
+cs_models/resources/TableFigure/models.py,sha256=RXuqM4BGzwuykCYrKNc1gkmtjvyftbp7gkUayX5UU00,1082
+cs_models/resources/TableFigure/schemas.py,sha256=sY7mElYRzVd8bzrPONQ4UL2C44z-Eckl-6ypFoNdDBI,1771
 cs_models/resources/TableOutbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/TableOutbox/models.py,sha256=NAq51yqxx4tRWsIoPKSOhRXkAAX0Yom7146qOJ4fX5E,837
 cs_models/resources/TableOutbox/schemas.py,sha256=zTR8wSwu9YSgsZX2CH7wPi-toGAkJDAQMPcYwBzWX8g,546
@@ -1092,6 +1092,9 @@ cs_models/resources/ViewMergerStage/schemas.py,sha256=ESFAkx25HLvkTW3PsD7FV1uaUg
 cs_models/resources/ViewMergerTarget/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/ViewMergerTarget/models.py,sha256=zsCp5TV2PNDq-hf53O_2Otv_O1TqSxY08WowUdhjQfw,749
 cs_models/resources/ViewMergerTarget/schemas.py,sha256=USAO8isTgJz6XUBm2bFnDwGrbaMEZShVVdJeKjgGtgc,352
+cs_models/resources/ViewPublicAssistantUserQuery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cs_models/resources/ViewPublicAssistantUserQuery/models.py,sha256=NlQewgaHtNi5akJEsI0ZkJyh4HC41HsEiW2zz6XtxYM,739
+cs_models/resources/ViewPublicAssistantUserQuery/schemas.py,sha256=-k8hMVPD0uBEBO80v9WrGTvWeFPMV0oKKHC7pM3idN4,364
 cs_models/resources/ViewPublicWorkbook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/ViewPublicWorkbook/models.py,sha256=j3HQyIURRlbqV4aKSb4ydCBCK7rDO9TEgnU6a_Z3ia0,701
 cs_models/resources/ViewPublicWorkbook/schemas.py,sha256=roJUBHpJm7C4jBvIWUNTV2nrwn4gzd0_Bu5_EcBk7jQ,352
@@ -1177,7 +1180,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.710.dist-info/METADATA,sha256=zOBaMXlSdBeNwA6C-DPAlQEqXY97KqSSA2dro2uvbH4,792
-cs_models-0.0.710.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cs_models-0.0.710.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
-cs_models-0.0.710.dist-info/RECORD,,
+cs_models-0.0.712.dist-info/METADATA,sha256=SE19aQggkcjEZzp9-uOQ1t31kvdAB21pzcwZdgY0oho,792
+cs_models-0.0.712.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cs_models-0.0.712.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
+cs_models-0.0.712.dist-info/RECORD,,