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

cs_models/resources/SmartDefGrid/models.py

@@ -11,7 +11,7 @@ class SmartDefGridModel(Base):
     """
     __tablename__ = "smart_def_grids"
 
-    id = Column(String(36), primary_key=True)  # table_id (uuid string)
+    id = Column(Integer, primary_key=True, autoincrement=True)  # table_id (uuid string)
     workbook_id = Column(
         Integer,
         ForeignKey('workbooks.id'),

cs_models/resources/SmartDefGrid/schemas.py

@@ -21,7 +21,7 @@ class SmartDefGridResourceSchema(Schema):
 
     # read-only expansion of cells
     cells = fields.Nested(
-        SmartDefGridCellResourceSchema(exclude="smart_def_grid_id"),
+        SmartDefGridCellResourceSchema(exclude=["smart_def_grid_id"]),
         many=True,
         dump_only=True,
         # if you strictly want to hide 'table_id' inside each cell in this view:

cs_models/resources/SmartDefGridCell/models.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from sqlalchemy import Column, DateTime, ForeignKey, Integer, String, JSON, Boolean, Index
+from sqlalchemy import Column, DateTime, ForeignKey, Integer, String, JSON, Boolean, Index, UniqueConstraint
 from sqlalchemy.orm import relationship
 from ...database import Base
 
@@ -29,7 +29,7 @@ class SmartDefGridCellModel(Base):
     formatting_spec = Column(JSON, nullable=True)
 
     # Optional: cache of the latest generated question id
-    latest_question_id = Column(String(36), ForeignKey("cell_questions.id"), nullable=True)
+    latest_question_id = Column(Integer, ForeignKey("smart_def_grid_cell_questions.id"), nullable=True)
 
     created_at = Column(DateTime, default=datetime.utcnow, nullable=False)
     updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow, nullable=False)
@@ -38,8 +38,14 @@ class SmartDefGridCellModel(Base):
     latest_question = relationship("SmartDefGridCellQuestionModel", foreign_keys=[latest_question_id], uselist=False)
 
     # Canonical applied cell value (write-back)
-    applied_value = relationship("SmartDefGridCellValueModel", back_populates="cell", uselist=False, cascade="all, delete-orphan")
+    applied_value = relationship(
+        "SmartDefGridCellValueModel",
+        back_populates="cell",
+        uselist=False,
+        cascade="all, delete-orphan",
+    )
 
     __table_args__ = (
+        UniqueConstraint("smart_def_grid_id", "row", "col", name="uq_sdg_cell_pos"),
         Index("ix_smart_def_grid_cells_header", "smart_def_grid_id", "is_header"),
     )

cs_models/resources/SmartDefGridCellAnswer/models.py

@@ -1,6 +1,5 @@
-import enum
 from datetime import datetime
-from sqlalchemy import Column, DateTime, ForeignKey, Float, String, JSON, Integer, Index, Text
+from sqlalchemy import Column, DateTime, ForeignKey, Float, String, JSON, Integer, Index, Text, BigInteger, ForeignKeyConstraint
 from sqlalchemy.orm import relationship
 from ...database import Base
 
@@ -11,7 +10,7 @@ class SmartDefGridCellAnswerModel(Base):
     """
     __tablename__ = "smart_def_grid_cell_answers"
 
-    id = Column(String(36), primary_key=True)  # answer_id (uuid)
+    id = Column(BigInteger, primary_key=True, autoincrement=True)
     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)
@@ -32,6 +31,11 @@ class SmartDefGridCellAnswerModel(Base):
 
     # convenience index to quickly get latest by created_at
     __table_args__ = (
+        ForeignKeyConstraint(
+            ["smart_def_grid_id", "cell_id"],
+            ["smart_def_grid_cells.smart_def_grid_id", "smart_def_grid_cells.cell_id"],
+            ondelete="CASCADE",
+        ),
         Index("ix_smart_def_grid_cell_answers_cell", "smart_def_grid_id", "cell_id", "created_at"),
     )
 

cs_models/resources/SmartDefGridCellQuestion/models.py

@@ -1,6 +1,6 @@
 import enum
 from datetime import datetime
-from sqlalchemy import Column, DateTime, ForeignKey, Integer, String, JSON, Boolean, Index, Text, Enum
+from sqlalchemy import Column, DateTime, ForeignKey, Integer, String, JSON, Boolean, Index, Text, Enum, ForeignKeyConstraint
 from sqlalchemy.orm import relationship
 from ...database import Base
 
@@ -24,7 +24,7 @@ class SmartDefGridCellQuestionModel(Base):
     """
     __tablename__ = "smart_def_grid_cell_questions"
 
-    id = Column(Integer, primary_key=True)  # question_id (uuid)
+    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)
     cell_id = Column(String(36), nullable=False)
 
@@ -57,6 +57,11 @@ class SmartDefGridCellQuestionModel(Base):
         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"),
+        ForeignKeyConstraint(
+            ["smart_def_grid_id", "cell_id"],
+            ["smart_def_grid_cells.smart_def_grid_id", "smart_def_grid_cells.cell_id"],
+            ondelete="CASCADE",
+        ),
         # strong uniqueness if you want only one ACTIVE per cell; or enforce app-side
         # UniqueConstraint("table_id", "cell_id", "status", name="uq_cell_question_cell_status"),
     )

cs_models/resources/SmartDefGridCellValue/models.py

@@ -1,7 +1,8 @@
 from datetime import datetime
-from sqlalchemy import Column, DateTime, ForeignKey, Float, String, JSON, Boolean, Integer, Text
+from sqlalchemy import Column, DateTime, ForeignKey, Float, String, JSON, Boolean, Integer, Text, ForeignKeyConstraint, and_
 from sqlalchemy.orm import relationship
 from ...database import Base
+from ..SmartDefGridCell.models import SmartDefGridCellModel
 
 
 class SmartDefGridCellValueModel(Base):
@@ -15,7 +16,7 @@ class SmartDefGridCellValueModel(Base):
     cell_id = Column(String(36), primary_key=True)
 
     # applied value derived from a specific answer_id (or manual override)
-    answer_id = Column(Integer, ForeignKey("smart_def_grid_cell_answers.id"), nullable=True)
+    answer_id = Column(Integer, ForeignKey("smart_def_grid_cell_answers.id", ondelete="SET NULL"), nullable=True)
     raw_value = Column(Float, nullable=True)
     display_text = Column(Text, nullable=True)
     citations = Column(JSON, nullable=True)
@@ -28,6 +29,24 @@ class SmartDefGridCellValueModel(Base):
     applied_at = Column(DateTime, default=datetime.utcnow, nullable=False)
     updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow, nullable=False)
 
+    __table_args__ = (
+        ForeignKeyConstraint(
+            ["smart_def_grid_id", "cell_id"],
+            ["smart_def_grid_cells.smart_def_grid_id", "smart_def_grid_cells.cell_id"],
+            ondelete="CASCADE",
+        ),
+    )
+
     # relationships
-    cell = relationship("SmartDefGridCellModel", back_populates="applied_value")
+    cell = relationship(
+        "SmartDefGridCellModel",
+        back_populates="applied_value",
+        uselist=False,
+        primaryjoin=lambda: and_(
+            SmartDefGridCellValueModel.smart_def_grid_id == SmartDefGridCellModel.smart_def_grid_id,
+            SmartDefGridCellValueModel.cell_id == SmartDefGridCellModel.cell_id,
+        ),
+        foreign_keys=lambda: [SmartDefGridCellValueModel.smart_def_grid_id, SmartDefGridCellValueModel.cell_id],
+    )
+
     answer = relationship("SmartDefGridCellAnswerModel", foreign_keys=[answer_id])

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

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

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

@@ -954,22 +954,22 @@ cs_models/resources/Signature13F/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 cs_models/resources/Signature13F/models.py,sha256=E-n7Fz1Lz7XOeD6H6Ca0TIe6ixxRXao0hWGGZJkr4m8,538
 cs_models/resources/Signature13F/schemas.py,sha256=5I0yQ5amGPQg2yoklmtJJ4HiQe14kNpw7OCUXFmrm1o,457
 cs_models/resources/SmartDefGrid/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cs_models/resources/SmartDefGrid/models.py,sha256=D2esCzBhZJI4Zo0nRvn-qAmxwa4JdIemAlapa0lGMt8,1243
-cs_models/resources/SmartDefGrid/schemas.py,sha256=ju7pZH4a-A9nbqya0yUGjMaN4lYqJ6IkOmtgHwhhM4U,2083
+cs_models/resources/SmartDefGrid/models.py,sha256=DuukDDYw-6U9KYfcciksTeC30uLlCZSWW8T-oKneGR8,1260
+cs_models/resources/SmartDefGrid/schemas.py,sha256=xmzr2f8sYVx5l9KU1SezytyRZUwmVAzm2Iwq1CqdHNs,2085
 cs_models/resources/SmartDefGridCell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cs_models/resources/SmartDefGridCell/models.py,sha256=n9VLx_2fuymJCwQqkS-prfXV9FhNTRQ6ZJcVUfRix-s,2161
+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=S0JoLWAV_hf9KAyStwztoI5zt3HQjuXFpKhOIHdrtLU,1706
+cs_models/resources/SmartDefGridCellAnswer/models.py,sha256=sQgZDzZUIw7WRUtjrVwk9BZANCnxcuxFaQ-9x4WCDto,1935
 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=69DbO4LvJXyyMIgWlukSX7CGPm3fof3hH-LsBTaYK_s,2724
+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/SmartDefGridCellValue/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cs_models/resources/SmartDefGridCellValue/models.py,sha256=TJiiqYkwVfqEsVF2VxrDFzvIAheL5r4UvH5Qx0lAAco,1526
+cs_models/resources/SmartDefGridCellValue/models.py,sha256=s5Tnj7s633qbAM14Eh4OU1QHN-CeSUe7GZSGrzywOGA,2259
 cs_models/resources/SmartDefGridCellValue/schemas.py,sha256=fqp1odR0nPheKjGeLScs9lPR6bDZzWVm2x78NNLuIRc,637
 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
@@ -1318,7 +1318,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.806.dist-info/METADATA,sha256=JeYpP8IGiDomdCYnBn4P7mEgZtPdFnnJkkmBvfz4Mxc,751
-cs_models-0.0.806.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cs_models-0.0.806.dist-info/top_level.txt,sha256=M7CA8Nh5t0vRManQ9gHfphhO16uhMqIbfaxr1jPDg18,10
-cs_models-0.0.806.dist-info/RECORD,,
+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,,