cs-models 0.0.807__py3-none-any.whl → 0.0.809__py3-none-any.whl

cs_models/resources/SmartDefGridCellAnswer/models.py

@@ -14,6 +14,7 @@ class SmartDefGridCellAnswerModel(Base):
     question_id = Column(Integer, ForeignKey("smart_def_grid_cell_questions.id", ondelete="CASCADE"), nullable=False)
 
     smart_def_grid_id = Column(Integer, ForeignKey("smart_def_grids.id", ondelete="CASCADE"), nullable=False)
+    run_id = Column(Integer, ForeignKey("smart_def_grid_runs.id", ondelete="SET NULL"), nullable=True)
     cell_id = Column(String(36), nullable=False)
 
     # canonical payload
@@ -37,6 +38,8 @@ class SmartDefGridCellAnswerModel(Base):
             ondelete="CASCADE",
         ),
         Index("ix_smart_def_grid_cell_answers_cell", "smart_def_grid_id", "cell_id", "created_at"),
+        Index("ix_sdgca_run_cell", "run_id", "smart_def_grid_id", "cell_id", "created_at"),
     )
 
     question = relationship("SmartDefGridCellQuestionModel", back_populates="answers")
+    run = relationship("SmartDefGridRunModel")

cs_models/resources/SmartDefGridCellQuestion/models.py

@@ -26,6 +26,7 @@ class SmartDefGridCellQuestionModel(Base):
 
     id = Column(Integer, primary_key=True, autoincrement=True)  # question_id (uuid)
     smart_def_grid_id = Column(Integer, ForeignKey("smart_def_grids.id", ondelete="CASCADE"), nullable=False)
+    run_id = Column(Integer, ForeignKey("smart_def_grid_runs.id", ondelete="SET NULL"), nullable=True)
     cell_id = Column(String(36), nullable=False)
 
     question_text = Column(Text, nullable=False)
@@ -35,6 +36,9 @@ class SmartDefGridCellQuestionModel(Base):
     topic_key = Column(JSON, nullable=True)
     retrieval_hints = Column(JSON, nullable=True)
 
+    # Answer
+    answer_text = Column(Text, nullable=True)
+
     # Queue & lifecycle
     status = Column(Enum(QuestionStatus), nullable=False, default=QuestionStatus.pending)
     priority = Column(Integer, nullable=False, default=5)     # lower = higher priority
@@ -51,12 +55,15 @@ class SmartDefGridCellQuestionModel(Base):
 
     # relationships
     answers = relationship("SmartDefGridCellAnswerModel", back_populates="question", cascade="all, delete-orphan")
+    run = relationship("SmartDefGridRunModel")
 
     __table_args__ = (
         # Useful to grab next jobs: status+priority+created
         Index("ix_smart_def_grid_cell_questions_queue", "status", "priority", "created_at"),
         # Quick lookup for this cell's active question(s)
         Index("ix_smart_def_grid_cell_questions_cell", "smart_def_grid_id", "cell_id"),
+        Index("ix_sdgcq_run_status", "run_id", "status", "priority", "created_at"),
+        Index("ix_sdgcq_run_cell", "run_id", "smart_def_grid_id", "cell_id"),
         ForeignKeyConstraint(
             ["smart_def_grid_id", "cell_id"],
             ["smart_def_grid_cells.smart_def_grid_id", "smart_def_grid_cells.cell_id"],

cs_models/resources/SmartDefGridCellQuestion/schemas.py

@@ -11,6 +11,7 @@ class SmartDefGridCellQuestionResourceSchema(Schema):
 
     id = fields.String(dump_only=True)
     smart_def_grid_id = fields.Integer(required=True)
+    run_id = fields.Integer(allow_none=True)
     cell_id = fields.String(required=True)
 
     question_text = fields.String(required=True, validate=not_blank)
@@ -20,6 +21,8 @@ class SmartDefGridCellQuestionResourceSchema(Schema):
     topic_key = fields.Raw(allow_none=True)              # e.g., {"row":[...], "col":[...]}
     retrieval_hints = fields.Raw(allow_none=True)
 
+    answer_text = fields.String(allow_none=True)
+
     status = fields.String(required=True, validate=validate.OneOf(QUESTION_STATUS))
     priority = fields.Integer(required=True)
     attempts = fields.Integer(required=True)

cs_models/resources/SmartDefGridCellValue/models.py

@@ -13,6 +13,7 @@ class SmartDefGridCellValueModel(Base):
     __tablename__ = "smart_def_grid_cell_values"
 
     smart_def_grid_id = Column(Integer, ForeignKey("smart_def_grids.id", ondelete="CASCADE"), primary_key=True)
+    applied_run_id = Column(Integer, ForeignKey("smart_def_grid_runs.id", ondelete="SET NULL"), nullable=True)
     cell_id = Column(String(36), primary_key=True)
 
     # applied value derived from a specific answer_id (or manual override)
@@ -50,3 +51,4 @@ class SmartDefGridCellValueModel(Base):
     )
 
     answer = relationship("SmartDefGridCellAnswerModel", foreign_keys=[answer_id])
+    applied_run = relationship("SmartDefGridRunModel")

cs_models/resources/SmartDefGridCellValue/schemas.py

@@ -3,6 +3,7 @@ from marshmallow import Schema, fields
 
 class SmartDefGridCellValueResourceSchema(Schema):
     smart_def_grid_id = fields.Integer(required=True)
+    applied_run_id = fields.Integer(allow_none=True)
     cell_id = fields.String(required=True)
 
     answer_id = fields.Integer(allow_none=True)

cs_models/resources/SmartDefGridRun/models.py

@@ -0,0 +1,43 @@
+from enum import Enum
+from datetime import datetime
+from sqlalchemy import Column, DateTime, ForeignKey, Integer, String, JSON, Text, Index
+from sqlalchemy.orm import relationship
+from ...database import Base
+
+
+class SmartDefGridRunStatus(str, Enum):
+    created = "created"
+    dispatched = "dispatched"
+    running = "running"
+    succeeded = "succeeded"
+    failed = "failed"
+    cancelled = "cancelled"
+    partial = "partial"   # finished with some failed cells
+
+
+class SmartDefGridRunModel(Base):
+    __tablename__ = "smart_def_grid_runs"
+
+    id = Column(Integer, primary_key=True, autoincrement=True)  # run_id
+    smart_def_grid_id = Column(Integer, ForeignKey("smart_def_grids.id", ondelete="CASCADE"), nullable=False)
+
+    # optional snapshotting to make runs reproducible/debuggable
+    outline_json = Column(JSON, nullable=False)  # new outline created for this run
+    original_table_json = Column(JSON, nullable=False)    # stamped block at run start
+
+    # execution metadata
+    status = Column(Enum(SmartDefGridRunStatus), nullable=False, default=SmartDefGridRunStatus.created)
+    started_by_user_id = Column(String(64), nullable=False)
+    notes = Column(Text, nullable=True)
+    # optional idempotency token if you want “re-run latest”
+    client_token = Column(String(128), nullable=True, index=True)
+
+    created_at = Column(DateTime, default=datetime.utcnow, nullable=False)
+    started_at = Column(DateTime, nullable=True)
+    finished_at = Column(DateTime, nullable=True)
+    updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow, nullable=False)
+
+    grid = relationship("SmartDefGridModel", backref="runs")
+    __table_args__ = (
+        Index("ix_sdgr_runs_grid_created", "smart_def_grid_id", "created_at"),
+    )

cs_models/resources/SmartDefGridRun/schemas.py

@@ -0,0 +1,28 @@
+from marshmallow import Schema, fields, validate
+
+
+class SmartDefGridRunResourceSchema(Schema):
+    """
+        The user-defined table artifact (aka 'SmartDefGrid' resource).
+        - id is your table_id (UUID string or int—your choice).
+        - outline_json/original_table_json can be dicts (preferred) or JSON strings if you’d rather store serialized blobs.
+        """
+    not_blank = validate.Length(min=1, error="Field cannot be blank")
+
+    id = fields.String(dump_only=True)  # table_id
+    smart_def_grid_id = fields.Integer(allow_none=True)  # if you link to a workbook
+
+    # prefer dicts; switch to fields.String if you store JSON-serialized strings
+    outline_json = fields.Raw(required=True)
+    original_table_json = fields.Raw(required=True)
+
+    status = fields.String(required=True)
+    started_by_user_id = fields.String(required=True)
+
+    notes = fields.String(allow_none=True)
+    client_token = fields.String(allow_none=True)
+
+    created_at = fields.DateTime(dump_only=True)
+    started_at = fields.DateTime(allow_none=True)
+    finished_at = fields.DateTime(allow_none=True)
+    updated_at = fields.DateTime(dump_only=True)

{cs_models-0.0.807.dist-info → cs_models-0.0.809.dist-info}/METADATA

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

{cs_models-0.0.807.dist-info → cs_models-0.0.809.dist-info}/RECORD

@@ -960,17 +960,20 @@ cs_models/resources/SmartDefGridCell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 cs_models/resources/SmartDefGridCell/models.py,sha256=rbvJPsKQLhWZjUMza1--kS5oQC_D7Ylde8jAzjRoG_8,2315
 cs_models/resources/SmartDefGridCell/schemas.py,sha256=opd_dD3dj-U618RABBAo8UFAKwt9wPev1WVnPQca26c,1479
 cs_models/resources/SmartDefGridCellAnswer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cs_models/resources/SmartDefGridCellAnswer/models.py,sha256=sQgZDzZUIw7WRUtjrVwk9BZANCnxcuxFaQ-9x4WCDto,1935
+cs_models/resources/SmartDefGridCellAnswer/models.py,sha256=5lvvhs8d8gV7IGP_fskJPD88r3ZUj6GfYa7qwXRyB1Q,2177
 cs_models/resources/SmartDefGridCellAnswer/schemas.py,sha256=Nvt2pRq7SbbFmnp6EWrvao0A9BmmXqHOsTqf3qTo22Y,915
 cs_models/resources/SmartDefGridCellAnswerCitation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/SmartDefGridCellAnswerCitation/models.py,sha256=pCNakAl08pSFTbuhJypF43zDfoapZDsvFPH2PP7QQqo,916
 cs_models/resources/SmartDefGridCellAnswerCitation/schemas.py,sha256=1dYybWcoSuhP0OLqwQ3igNeexMcV-Nj0IqtBaPVap-Q,568
 cs_models/resources/SmartDefGridCellQuestion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cs_models/resources/SmartDefGridCellQuestion/models.py,sha256=cn2k5mBB-YPcAECLdO2y-3QB1_Db9MtKkLXIsWp0kWg,2973
-cs_models/resources/SmartDefGridCellQuestion/schemas.py,sha256=L6WKwJA5h-s46SlpdJAdC2B4kj0yfNwhPQw5EAU1pm8,1536
+cs_models/resources/SmartDefGridCellQuestion/models.py,sha256=3pOYSZZnY6ufYBkRTqbV7heuclfDIcm8SnUy0kJDNic,3345
+cs_models/resources/SmartDefGridCellQuestion/schemas.py,sha256=P1w8PTxhC7D6zYcs1ijy-ZZxHrYJJnAfDXNV-zbn3UY,1631
 cs_models/resources/SmartDefGridCellValue/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cs_models/resources/SmartDefGridCellValue/models.py,sha256=s5Tnj7s633qbAM14Eh4OU1QHN-CeSUe7GZSGrzywOGA,2259
-cs_models/resources/SmartDefGridCellValue/schemas.py,sha256=fqp1odR0nPheKjGeLScs9lPR6bDZzWVm2x78NNLuIRc,637
+cs_models/resources/SmartDefGridCellValue/models.py,sha256=xNonMUcjN09lqS0CrYLoVGRpsGPFvW75FcT5IY7ggUA,2425
+cs_models/resources/SmartDefGridCellValue/schemas.py,sha256=RjxVxBtxd29iReLOfArdHOzmV4ruyfyUnqfL8Wf9BG4,690
+cs_models/resources/SmartDefGridRun/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cs_models/resources/SmartDefGridRun/models.py,sha256=8ZKow4PVBztg6w5fOHq5Plj3e5u-jEwqDtCnqpPv2uc,1773
+cs_models/resources/SmartDefGridRun/schemas.py,sha256=VQeBvql_e_K9cGKmDR6t8GMkJjkYW_HxaB4lvaHmQpI,1156
 cs_models/resources/SmartGrid/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs_models/resources/SmartGrid/models.py,sha256=9weIkYbh-Y-My5vjjUP-N-ziSNV-AWww1UUltK8EIy0,1011
 cs_models/resources/SmartGrid/schemas.py,sha256=v5iG5dsEDnRp8P3UKba7uN39ZD_hqPvfLWyX1ltKKjM,665
@@ -1318,7 +1321,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=BzCDk3u1np7DoJQqCZIJN4f80JNHvJoWO4qEFgolN-8,4474
 cs_models/utils/profiling/__init__.py,sha256=N-73vb0M92C975fxgXyBCBjCPELl8Oh21ZY_-tzDnns,569
-cs_models-0.0.807.dist-info/METADATA,sha256=mAyTc6ckLHPStWK7qq_5p47Gji1jWfcSCznqpK52fAE,751
-cs_models-0.0.807.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cs_models-0.0.807.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
-cs_models-0.0.807.dist-info/RECORD,,
+cs_models-0.0.809.dist-info/METADATA,sha256=U9I0K62CRB-BgplOLXTLhsJUuoicVhuPKDovNGbHaQA,751
+cs_models-0.0.809.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cs_models-0.0.809.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
+cs_models-0.0.809.dist-info/RECORD,,