Merge branch 'master' into enhancement/saving-state-last-updated

requirements-base.txt

@@ -31,7 +31,7 @@ attrs==22.1.0
     #   jsonschema
 backoff==2.2.1
     # via schemathesis
-bcrypt==4.0.1
+bcrypt==4.1.1
     # via -r requirements-base.in
 blis==0.7.10
     # via thinc
@@ -246,7 +246,7 @@ oauthlib[signedtoken]==3.2.2
     #   atlassian-python-api
     #   jira
     #   requests-oauthlib
-openai==1.3.5
+openai==1.3.6
     # via -r requirements-base.in
 packaging==23.1
     # via
@@ -375,13 +375,13 @@ s3transfer==0.7.0
     # via boto3
 schedule==1.2.1
     # via -r requirements-base.in
-schemathesis==3.21.1
+schemathesis==3.21.2
     # via -r requirements-base.in
 scipy==1.11.2
     # via statsmodels
 sentry-asgi==0.2.0
     # via -r requirements-base.in
-sentry-sdk==1.37.1
+sentry-sdk==1.38.0
     # via
     #   -r requirements-base.in
     #   sentry-asgi
@@ -418,6 +418,7 @@ sniffio==1.3.0
     #   anyio
     #   httpcore
     #   httpx
+    #   openai
 sortedcontainers==2.4.0
     # via hypothesis
 spacy==3.7.2

src/dispatch/case/models.py

@@ -182,12 +182,11 @@ class SignalRead(DispatchBase):
 
 
 class SignalInstanceRead(DispatchBase):
-    signal: SignalRead
+    created_at: datetime
     entities: Optional[List[EntityRead]] = []
-    tags: Optional[List[TagRead]] = []
     raw: Any
-    fingerprint: Optional[str]
-    created_at: datetime
+    signal: SignalRead
+    tags: Optional[List[TagRead]] = []
 
 
 class ProjectRead(DispatchBase):

src/dispatch/database/revisions/tenant/versions/2023-11-29_580a18ec4c39.py

@@ -0,0 +1,30 @@
+"""Removes unused fingerprint column from signal instance model
+
+Revision ID: 580a18ec4c39
+Revises: bdaeabba3e53
+Create Date: 2023-11-29 15:40:12.524085
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision = "580a18ec4c39"
+down_revision = "bdaeabba3e53"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("signal_instance", "fingerprint")
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "signal_instance",
+        sa.Column("fingerprint", sa.VARCHAR(), autoincrement=False, nullable=True),
+    )
+    # ### end Alembic commands ###

src/dispatch/signal/models.py

@@ -229,7 +229,6 @@ class SignalInstance(Base, TimeStampMixin, ProjectMixin):
     case_type = relationship("CaseType", backref="signal_instances")
     case_priority_id = Column(Integer, ForeignKey(CasePriority.id))
     case_priority = relationship("CasePriority", backref="signal_instances")
-    fingerprint = Column(String)
     filter_action = Column(String)
     canary = Column(Boolean, default=False)
     raw = Column(JSONB)
@@ -381,7 +380,6 @@ class SignalInstanceCreate(SignalInstanceBase):
 
 class SignalInstanceRead(SignalInstanceBase):
     id: uuid.UUID
-    fingerprint: Optional[str]
     signal: SignalRead
 
 

tests/factories.py

@@ -831,7 +831,6 @@ class SignalInstanceFactory(BaseFactory):
     id = LazyFunction(uuid.uuid4)
     project = SubFactory(ProjectFactory)
     case = SubFactory(CaseFactory)
-    fingerprint = fake.md5()
     signal = SubFactory(SignalFactory)
     raw = {
         "action": [{"type": "AWS_API_CALL", "value": {"Api": "assumerole", "ServiceName": "sts"}}],