Merge branch 'master' into chore/upgrade-node

Author: mvilanova

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11.4-slim-bullseye as sdist
+FROM python:3.13.0-slim-bullseye as sdist
 
 LABEL maintainer="[email protected]"
 LABEL org.opencontainers.image.title="Dispatch PyPI Wheel"
@@ -56,7 +56,7 @@ RUN YARN_CACHE_FOLDER="$(mktemp -d)" \
     && mv /usr/src/dispatch/dist /dist
 
 # This is the image to be run
-FROM python:3.11.4-slim-bullseye
+FROM python:3.13.0-slim-bullseye
 
 LABEL maintainer="[email protected]"
 LABEL org.opencontainers.image.title="Dispatch"

docs/package-lock.json

@@ -330,7 +330,7 @@ python-dateutil==2.9.0.post0
     #   pandas
 python-jose==3.3.0
     # via -r requirements-base.in
-python-multipart==0.0.12
+python-multipart==0.0.16
     # via -r requirements-base.in
 python-slugify==8.0.4
     # via -r requirements-base.in
@@ -396,9 +396,9 @@ six==1.16.0
     #   python-dateutil
     #   sqlalchemy-filters
     #   validators
-slack-bolt==1.20.1
+slack-bolt==1.21.2
     # via -r requirements-base.in
-slack-sdk==3.33.1
+slack-sdk==3.33.3
     # via
     #   -r requirements-base.in
     #   slack-bolt
@@ -496,7 +496,7 @@ wasabi==1.1.2
     #   weasel
 weasel==0.3.4
     # via spacy
-werkzeug==3.0.3
+werkzeug==3.0.6
     # via schemathesis
 wrapt==1.16.0
     # via deprecated

requirements-base.txt

@@ -18,7 +18,7 @@ click==8.1.7
     # via
     #   -r requirements-dev.in
     #   black
-coverage==7.6.3
+coverage==7.6.4
     # via -r requirements-dev.in
 decorator==5.1.1
     # via ipython
@@ -32,7 +32,7 @@ executing==2.0.1
     #   stack-data
 factory-boy==3.3.1
     # via -r requirements-dev.in
-faker==30.6.0
+faker==30.8.1
     # via
     #   -r requirements-dev.in
     #   factory-boy
@@ -42,7 +42,7 @@ identify==2.5.33
     # via pre-commit
 iniconfig==2.0.0
     # via pytest
-ipython==8.28.0
+ipython==8.29.0
     # via -r requirements-dev.in
 jedi==0.19.1
     # via ipython
@@ -86,7 +86,7 @@ python-dateutil==2.9.0.post0
     # via faker
 pyyaml==6.0.1
     # via pre-commit
-ruff==0.6.9
+ruff==0.7.1
     # via -r requirements-dev.in
 six==1.16.0
     # via

requirements-dev.txt

@@ -8,7 +8,6 @@
 from dispatch.case.messaging import send_case_welcome_participant_message
 from dispatch.case.models import CaseRead
 from dispatch.conversation import flows as conversation_flows
-from dispatch.database.core import SessionLocal
 from dispatch.decorators import background_task
 from dispatch.document import flows as document_flows
 from dispatch.enums import DocumentResourceTypes, EventType, Visibility
@@ -34,18 +33,19 @@
 from dispatch.storage.enums import StorageAction
 from dispatch.ticket import flows as ticket_flows
 
+from .enums import CaseResolutionReason, CaseStatus
 from .messaging import (
     send_case_created_notifications,
     send_case_rating_feedback_message,
     send_case_update_notifications,
 )
-from .models import Case, CaseStatus
+from .models import Case
 from .service import get
 
 log = logging.getLogger(__name__)
 
 
-def get_case_participants_flow(case: Case, db_session: SessionLocal):
+def get_case_participants_flow(case: Case, db_session: Session):
     """Get additional case participants based on priority, type and description."""
     individual_contacts = []
     team_contacts = []
@@ -192,6 +192,30 @@ def update_conversation(case: Case, db_session: Session) -> None:
     )
 
 
+def case_auto_close_flow(case: Case, db_session: Session):
+    "Runs the case auto close flow."
+    # we mark the case as closed
+    case.resolution = "Auto closed via case type auto close configuration."
+    case.resolution_reason = CaseResolutionReason.user_acknowledge
+    case.status = CaseStatus.closed
+    db_session.add(case)
+    db_session.commit()
+
+    # we transition the case from the new to the closed state
+    case_triage_status_flow(
+        case=case,
+        db_session=db_session,
+    )
+    case_closed_status_flow(
+        case=case,
+        db_session=db_session,
+    )
+
+    if case.conversation and case.has_thread:
+        # we update the case conversation
+        update_conversation(case=case, db_session=db_session)
+
+
 def case_new_create_flow(
     *,
     case_id: int,
@@ -254,6 +278,10 @@ def case_new_create_flow(
             log.warning("Case assignee not paged. No plugin of type oncall enabled.")
             return case
 
+    if case and case.case_type.auto_close:
+        # we transition the case to the closed state if its case type has auto close enabled
+        case_auto_close_flow(case=case, db_session=db_session)
+
     return case
 
 
@@ -336,7 +364,11 @@ def case_update_flow(
     # we get the case
     case = get(db_session=db_session, case_id=case_id)
 
-    if reporter_email and case and reporter_email != case.reporter.individual.email:
+    if not case:
+        log.warning(f"Case with id {case_id} not found.")
+        return
+
+    if reporter_email and case.reporter and reporter_email != case.reporter.individual.email:
         # we run the case assign role flow for the reporter if it changed
         case_assign_role_flow(
             case_id=case.id,
@@ -345,7 +377,7 @@ def case_update_flow(
             db_session=db_session,
         )
 
-    if assignee_email and case and assignee_email != case.assignee.individual.email:
+    if assignee_email and case.assignee and assignee_email != case.assignee.individual.email:
         # we run the case assign role flow for the assignee if it changed
         case_assign_role_flow(
             case_id=case.id,
@@ -374,15 +406,15 @@ def case_update_flow(
 
     if case.tactical_group:
         # we update the tactical group
-        if reporter_email and reporter_email != case.reporter.individual.email:
+        if reporter_email and case.reporter and reporter_email != case.reporter.individual.email:
             group_flows.update_group(
                 subject=case,
                 group=case.tactical_group,
                 group_action=GroupAction.add_member,
                 group_member=reporter_email,
                 db_session=db_session,
             )
-        if assignee_email and assignee_email != case.assignee.individual.email:
+        if assignee_email and case.assignee and assignee_email != case.assignee.individual.email:
             group_flows.update_group(
                 subject=case,
                 group=case.tactical_group,
@@ -405,7 +437,7 @@ def case_update_flow(
         send_case_update_notifications(case, previous_case, db_session)
 
 
-def case_delete_flow(case: Case, db_session: SessionLocal):
+def case_delete_flow(case: Case, db_session: Session):
     """Runs the case delete flow."""
     # we delete the external ticket
     if case.ticket:
@@ -488,6 +520,9 @@ def case_closed_status_flow(case: Case, db_session=None):
     if not storage_plugin:
         return
 
+    # we update the ticket
+    ticket_flows.update_case_ticket(case=case, db_session=db_session)
+
     # Open document access if configured
     if storage_plugin.configuration.open_on_close:
         for document in case.documents:

src/dispatch/case/flows.py

@@ -1,10 +1,11 @@
 from typing import List, Optional
 
-from pydantic import Field, validator, AnyHttpUrl
+from pydantic import AnyHttpUrl, Field, validator
 from sqlalchemy import JSON, Boolean, Column, ForeignKey, Integer, String
 from sqlalchemy.event import listen
 from sqlalchemy.ext.hybrid import hybrid_method
 from sqlalchemy.orm import relationship
+from sqlalchemy.sql import false
 from sqlalchemy.sql.schema import UniqueConstraint
 from sqlalchemy_utils import TSVectorType
 
@@ -27,6 +28,7 @@ class CaseType(ProjectMixin, Base):
     exclude_from_metrics = Column(Boolean, default=False)
     plugin_metadata = Column(JSON, default=[])
     conversation_target = Column(String)
+    auto_close = Column(Boolean, default=False, server_default=false())
 
     # the catalog here is simple to help matching "named entities"
     search_vector = Column(TSVectorType("name", regconfig="pg_catalog.simple"))
@@ -100,6 +102,7 @@ class CaseTypeBase(DispatchBase):
     project: Optional[ProjectRead]
     visibility: Optional[str] = Field(None, nullable=True)
     cost_model: Optional[CostModelRead] = None
+    auto_close: Optional[bool] = False
 
     @validator("plugin_metadata", pre=True)
     def replace_none_with_empty_list(cls, value):

src/dispatch/case/type/models.py

@@ -0,0 +1,99 @@
+"""Adds configuration to the Dispatch Ticket PluginInstance
+
+Revision ID: 24322617ce9a
+Revises: 3c49f62d7914
+Create Date: 2024-10-25 15:15:38.078421
+
+"""
+
+from alembic import op
+from pydantic import SecretStr, ValidationError
+from pydantic.json import pydantic_encoder
+
+from sqlalchemy import Column, Integer, ForeignKey, String
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship, Session
+from sqlalchemy.ext.hybrid import hybrid_property
+from sqlalchemy_utils import StringEncryptedType
+from sqlalchemy_utils.types.encrypted.encrypted_type import AesEngine
+from dispatch.config import DISPATCH_ENCRYPTION_KEY
+
+# revision identifiers, used by Alembic.
+revision = "24322617ce9a"
+down_revision = "3c49f62d7914"
+branch_labels = None
+depends_on = None
+
+Base = declarative_base()
+
+
+def show_secrets_encoder(obj):
+    if isinstance(obj, SecretStr):
+        return obj.get_secret_value()
+    else:
+        return pydantic_encoder(obj)
+
+
+def migrate_config(instances, slug, config):
+    for instance in instances:
+        if slug == instance.plugin.slug:
+            instance.configuration = config
+
+
+class Plugin(Base):
+    __tablename__ = "plugin"
+    __table_args__ = {"schema": "dispatch_core"}
+    id = Column(Integer, primary_key=True)
+    slug = Column(String, unique=True)
+
+
+class PluginInstance(Base):
+    __tablename__ = "plugin_instance"
+    id = Column(Integer, primary_key=True)
+    _configuration = Column(
+        StringEncryptedType(key=str(DISPATCH_ENCRYPTION_KEY), engine=AesEngine, padding="pkcs5")
+    )
+    plugin_id = Column(Integer, ForeignKey(Plugin.id))
+    plugin = relationship(Plugin, backref="instances")
+
+    @hybrid_property
+    def configuration(self):
+        """Property that correctly returns a plugins configuration object."""
+        pass
+
+    @configuration.setter
+    def configuration(self, configuration):
+        """Property that correctly sets a plugins configuration object."""
+        if configuration:
+            self._configuration = configuration.json(encoder=show_secrets_encoder)
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    from dispatch.plugins.dispatch_core.config import DispatchTicketConfiguration
+
+    bind = op.get_bind()
+    session = Session(bind=bind)
+
+    instances = session.query(PluginInstance).all()
+
+    try:
+        dispatch_ticket_config = DispatchTicketConfiguration(
+            use_incident_name=False,
+        )
+
+        migrate_config(instances, "dispatch-ticket", dispatch_ticket_config)
+
+    except ValidationError:
+        print(
+            "Skipping automatic migration of Dispatch ticket plugin, if you are using the Dispatch ticket plugin, please manually migrate."
+        )
+
+    session.commit()
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###

src/dispatch/database/revisions/tenant/versions/2024-10-25_24322617ce9a.py

@@ -0,0 +1,31 @@
+"""Adds auto_close column to case_type model
+
+Revision ID: 3edb0476365a
+Revises: 24322617ce9a
+Create Date: 2024-10-29 13:26:29.001448
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "3edb0476365a"
+down_revision = "24322617ce9a"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "case_type",
+        sa.Column("auto_close", sa.Boolean(), server_default=sa.text("false"), nullable=True),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("case_type", "auto_close")
+    # ### end Alembic commands ###