cs-models 0.0.572__py3-none-any.whl → 0.0.574__py3-none-any.whl

cs_models/resources/BatchJobStatus/models.py

@@ -0,0 +1,31 @@
+from datetime import datetime
+
+from sqlalchemy import (
+    Column,
+    Integer,
+    DateTime,
+    String,
+    Text,
+)
+
+from ...database import Base
+
+
+class BatchJobStatusModel(Base):
+    __tablename__ = "batch_jobs_status"
+
+    id = Column(Integer, primary_key=True)
+    job_id = Column(String(128), nullable=False, index=True)
+    job_def = Column(String(128), nullable=False, index=True)
+    job_queue = Column(String(125), nullable=False, index=True)
+    parameters = Column(Text, nullable=True)
+    status = Column(String(50), nullable=False)
+    created_at = Column(DateTime, nullable=False)
+    updated_at = Column(
+        DateTime,
+        nullable=False,
+        index=True,
+        # https://stackoverflow.com/questions/58776476/why-doesnt-freezegun-work-with-sqlalchemy-default-values
+        default=lambda: datetime.utcnow(),
+        onupdate=lambda: datetime.utcnow(),
+    )

cs_models/resources/BatchJobStatus/schemas.py

@@ -0,0 +1,18 @@
+from marshmallow import (
+    Schema,
+    fields,
+    validate,
+)
+
+
+class BatchJobStatusResourceSchema(Schema):
+    not_blank = validate.Length(min=1, error='Field cannot be blank')
+
+    id = fields.Integer(dump_only=True)
+    job_id = fields.String(required=True)
+    job_def = fields.String(required=True)
+    job_queue = fields.String(required=True)
+    parameters = fields.String(allow_none=True)
+    status = fields.String(required=True)
+    created_at = fields.DateTime(required=True)
+    updated_at = fields.DateTime(dump_only=True)

cs_models/resources/UserWatchlist/models.py

@@ -4,6 +4,7 @@ from sqlalchemy import (
     String,
     DateTime,
     Boolean,
+    ForeignKey,
 )
 from datetime import datetime
 
@@ -18,6 +19,11 @@ class UserWatchlistModel(Base):
     resource_type = Column(String(128), nullable=False, index=True)
     resource_id = Column(String(50), nullable=False, index=True)
     is_active = Column(Boolean, nullable=True)
+    saved_search_id = Column(
+        Integer,
+        ForeignKey('user_saved_searches.id'),
+        nullable=False,
+    )
     updated_at = Column(
         DateTime,
         nullable=False,

cs_models/resources/UserWatchlist/schemas.py

@@ -13,4 +13,5 @@ class UserWatchlistResourceSchema(Schema):
     resource_type = fields.String(required=True)
     resource_id = fields.String(required=True)
     is_active = fields.Boolean(required=True)
+    saved_search_id = fields.Integer(required=True)
     updated_at = fields.DateTime(dump_only=True)

{cs_models-0.0.572.dist-info → cs_models-0.0.574.dist-info}/METADATA

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

{cs_models-0.0.572.dist-info → cs_models-0.0.574.dist-info}/RECORD

@@ -37,6 +37,9 @@ cs_models/resources/AssistantSession/schemas.py,sha256=Sc5pFt5O3ISQRR-hRYW7LcCqA
 cs_models/resources/AssistantUserQuery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/AssistantUserQuery/models.py,sha256=fCM9N65laJanb_hVzFgTMzVLV09KuqSQKa27RuHhnMU,1753
 cs_models/resources/AssistantUserQuery/schemas.py,sha256=dGAHxkNxY7v8iD0EtKi_XJrIBF67ie-r7j6wNnAewP0,716
+cs_models/resources/BatchJobStatus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cs_models/resources/BatchJobStatus/models.py,sha256=nKXTIzOp_T0vWOgaLBMg-8gCq6MiKSktyfjG9JFxQGg,890
+cs_models/resources/BatchJobStatus/schemas.py,sha256=Wqze3FXBQdHuCjPhHEa9FUGy2doq0ijpKmxuwFD9wpc,540
 cs_models/resources/Biomarker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/Biomarker/models.py,sha256=67yyvRKi6_5pLwSH6IE9ZTemIqmpsCx7IIVDSqMwOvo,810
 cs_models/resources/Biomarker/schemas.py,sha256=saP7FJfKeUPDHEhKeJqLci9gze3WZYXWgP1M-ySMWmE,434
@@ -805,8 +808,8 @@ cs_models/resources/UserSearchHistoryItem/models.py,sha256=GdNZsTEett2x_gU92iPbR
 cs_models/resources/UserSearchHistoryItem/schemas.py,sha256=e68GcY-1KV75VWwWCGryTufWXHL09h7b48UhxieoaUQ,747
 cs_models/resources/UserSearchHistoryItem/test_user_search_history_item.py,sha256=eoiVJpVS-_Fe6k2Bc1oCTc6gRggI1N1kc_trTNQ1w60,2904
 cs_models/resources/UserWatchlist/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cs_models/resources/UserWatchlist/models.py,sha256=hYylKBmu8OHvGWNaQkaC-J_ZRvLZCniWWj44XThV0VY,769
-cs_models/resources/UserWatchlist/schemas.py,sha256=eIA2vOEJ2_ipZFHn8AESnwEwGGneMtLLC7ZIgO1PCcM,476
+cs_models/resources/UserWatchlist/models.py,sha256=XPWn6KgwcWfAaYuaEkK1sRw304DvKbLXnvn_MjO_Q-Y,908
+cs_models/resources/UserWatchlist/schemas.py,sha256=gM4N7ClcMGvyaSzIg95SSOw1EbFdZ2tUbAke33FwtS8,528
 cs_models/resources/ViewConditionByTA/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/ViewConditionByTA/models.py,sha256=CieIW5mvmvok4dbglxd-ijMVI7gx-6C057CViSjuWoQ,764
 cs_models/resources/ViewConditionByTA/schemas.py,sha256=Y0hoMeysHulflnPUchmDP0NDsSTKtIZH-UXRvp2fIRw,441
@@ -928,7 +931,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.572.dist-info/METADATA,sha256=3mkrYLztO5HTiKtrmUUjPdfNtGxVRb38c9mh5Bx5ZoI,791
-cs_models-0.0.572.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cs_models-0.0.572.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
-cs_models-0.0.572.dist-info/RECORD,,
+cs_models-0.0.574.dist-info/METADATA,sha256=_7qFwP8lUsWnCjJUpOhQtJ-Un6AyGuZIze2WvLSCi14,791
+cs_models-0.0.574.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cs_models-0.0.574.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
+cs_models-0.0.574.dist-info/RECORD,,