firefighter-incident 0.0.32__tar.gz → 0.0.34__tar.gz

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: firefighter-incident
-Version: 0.0.32
+Version: 0.0.34
 Summary: Incident Management tool made for Slack using Django
 Project-URL: Repository, https://github.com/ManoManoTech/firefighter-incident
 Project-URL: Documentation, https://manomanotech.github.io/firefighter-incident/latest/

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.32'
-__version_tuple__ = version_tuple = (0, 0, 32)
+__version__ = version = '0.0.34'
+__version_tuple__ = version_tuple = (0, 0, 34)
 
 __commit_id__ = commit_id = None

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/api/admin.py

@@ -49,7 +49,7 @@ class APITokenAdmin(TokenAdmin):
         self,
         request: HttpRequest,  # type: ignore[override]
         obj: APITokenProxy | None = None,
-        change: bool = False,  # noqa: FBT001, FBT002
+        change: bool = False,  # noqa: FBT002
         **kwargs: Any,
     ) -> type[ModelForm[APITokenProxy]]:
         """Prefill the form with the current user."""

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/api/authentication.py

@@ -14,7 +14,6 @@ class BearerTokenAuthentication(TokenAuthentication):
     keyword = "Bearer"
 
     def get_model(self) -> type[Model]:
-        # ruff: noqa: PLC0415
         from firefighter.api.models import APIToken
 
         return APIToken

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/confluence/service.py

@@ -20,7 +20,6 @@ logger = logging.getLogger(__name__)
 
 @cache
 def get_confluence_client() -> type[ConfluenceClient]:
-    # ruff: noqa: PLC0415
     from firefighter.confluence.client import ConfluenceClient
 
     return ConfluenceClient

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/firefighter/sso.py

@@ -10,7 +10,6 @@ logger = logging.getLogger(__name__)
 
 
 def link_auth_user(user: User, claim: dict[str, str | list[str]]) -> None:
-    # ruff: noqa: PLC0415
 
     # Check that roles are in the claim
     group_names = claim.get("roles")

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/incidents/forms/unified_incident.py

@@ -11,12 +11,11 @@ from firefighter.incidents.forms.create_incident import CreateIncidentFormBase
 from firefighter.incidents.forms.select_impact import SelectImpactForm
 from firefighter.incidents.forms.utils import GroupedModelChoiceField
 from firefighter.incidents.models import Environment, IncidentCategory, Priority
-from firefighter.incidents.models.impact import LevelChoices
+from firefighter.incidents.models.impact import ImpactLevel, LevelChoices
 from firefighter.incidents.models.incident import Incident
 from firefighter.incidents.signals import create_incident_conversation
 
 if TYPE_CHECKING:
-    from firefighter.incidents.models.impact import ImpactLevel
     from firefighter.incidents.models.user import User
     from firefighter.jira_app.models import JiraUser
 
@@ -232,13 +231,9 @@ class UnifiedIncidentForm(CreateIncidentFormBase):
 
             # If it's a UUID string, fetch the ImpactLevel from database
             if isinstance(impact, str):
-                from firefighter.incidents.models.impact import (
-                    ImpactLevel as ImpactLevelModel,
-                )
-
                 try:
-                    impact_obj = ImpactLevelModel.objects.get(id=impact)
-                except ImpactLevelModel.DoesNotExist:
+                    impact_obj = ImpactLevel.objects.get(id=impact)
+                except ImpactLevel.DoesNotExist:
                     return False
                 else:
                     return impact_obj.value != LevelChoices.NONE.value
@@ -415,9 +410,6 @@ class UnifiedIncidentForm(CreateIncidentFormBase):
             creator: User creating the incident
             impacts_data: Dictionary of impact data
         """
-        from firefighter.incidents.forms.select_impact import (
-            SelectImpactForm,
-        )
         from firefighter.raid.client import client as jira_client
         from firefighter.raid.forms import (
             alert_slack_new_jira_ticket,

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/incidents/models/incident_category.py

@@ -159,7 +159,6 @@ class IncidentCategory(models.Model):
     updated_at = models.DateTimeField(auto_now=True)
 
     if TYPE_CHECKING:
-        # ruff: noqa: PLC0415
         if settings.ENABLE_SLACK:
             from firefighter.slack.models.conversation import Conversation
             from firefighter.slack.models.user_group import UserGroup

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/incidents/tasks/updateoncall.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING, Any
 
-from celery import shared_task
+from celery import Signature, shared_task
 from django.conf import settings
 
 from firefighter.slack.slack_templating import user_slack_handle_or_name
@@ -28,7 +28,7 @@ BASE_URL: str = settings.BASE_URL
 @shared_task(name="incidents.update_oncall")
 def update_oncall() -> None:
     """Fetch current on-calls and update the on-call Slack topic and Confluence page."""
-    chain = (
+    chain: Signature[bool] = (
         fetch_oncalls.s()  # pyright: ignore[reportUnboundVariable]
         | update_oncall_views.s()
     )

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/incidents/views/date_utils.py

@@ -17,7 +17,6 @@ TZ = timezone.get_current_timezone()
 
 @functools.cache
 def get_ddp() -> DateDataParser:
-    # ruff: noqa: PLC0415
     from dateparser.date import DateDataParser
 
     return DateDataParser(

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/slack/admin.py

@@ -234,7 +234,7 @@ class UserGroupAdmin(admin.ModelAdmin[UserGroup]):
         request: HttpRequest,
         obj: UserGroup,
         form: ModelForm[UserGroup],
-        change: bool,  # noqa: FBT001
+        change: bool,
     ) -> None:
         # If added, check that we have all properties, or fetch them from firefighter.slack.
         if not change and not (
@@ -374,7 +374,6 @@ def ask_key_timestamps(
     """Will send a message to the Incident conversation (if it exists) to ask for key events.
     TODO Error handling.
     """
-    # ruff: noqa: PLC0415
     from firefighter.slack.views.modals.key_event_message import SlackMessageKeyEvents
 
     success: list[tuple[int, bool]] = []

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/slack/management/commands/generate_manifest.py

@@ -1,7 +1,9 @@
 from __future__ import annotations
 
+import json
 from typing import TYPE_CHECKING, Any
 
+import yaml
 from django.conf import settings
 from django.core.management.base import (
     BaseCommand,
@@ -191,11 +193,7 @@ def output_manifest(
     manifest: dict[str, Any], output_format: str, stdout: OutputWrapper
 ) -> None:
     if output_format == "json":
-        import json
-
         stdout.write(json.dumps(manifest, indent=2, ensure_ascii=False))
 
     elif output_format == "yml":
-        import yaml
-
         stdout.write(yaml.dump(manifest, allow_unicode=True))

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/slack/messages/slack_messages.py

@@ -61,7 +61,6 @@ SLACK_APP_EMOJI: str = settings.SLACK_APP_EMOJI
 
 
 def get_key_events_accessory(incident: Incident) -> dict[str, Any]:
-    # ruff: noqa: PLC0415
     from firefighter.slack.views.modals.key_event_message import SlackMessageKeyEvents
 
     key_events_msg = Message.objects.get_or_none(

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/slack/models/conversation.py

@@ -433,7 +433,6 @@ class Conversation(models.Model):
 
     @staticmethod
     def _get_message_manager() -> MessageManager:
-        # ruff: noqa: PLC0415
         from firefighter.slack.models.message import Message
 
         return Message.objects

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/slack/signals/incident_updated.py

@@ -201,7 +201,6 @@ def incident_key_events_updated_handler(
         logger.info(f"Skipping key events update for incident {incident.id} (direct closure)")
         return
 
-    # Everything in Slack views trigger the Slack handshake, so we delay the import
     from firefighter.slack.views.modals.key_event_message import (
         SlackMessageKeyEvents,
     )

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/slack/signals/postmortem_created.py

@@ -8,6 +8,7 @@ from slack_sdk.errors import SlackApiError
 
 from firefighter.incidents.signals import postmortem_created
 from firefighter.slack.messages.slack_messages import (
+    SlackMessageIncidentDeclaredAnnouncement,
     SlackMessageIncidentPostMortemCreated,
 )
 
@@ -48,10 +49,6 @@ def postmortem_created_send(sender: Any, incident: Incident, **kwargs: Any) -> N
     )
 
     # Update the initial incident message with post-mortem links
-    from firefighter.slack.messages.slack_messages import (
-        SlackMessageIncidentDeclaredAnnouncement,
-    )
-
     incident.conversation.send_message_and_save(
         SlackMessageIncidentDeclaredAnnouncement(incident)
     )

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/slack/views/modals/edit.py

@@ -6,6 +6,7 @@ from typing import TYPE_CHECKING, Any
 from slack_sdk.models.views import View
 
 from firefighter.incidents.forms.edit import EditMetaForm
+from firefighter.incidents.models import Environment
 from firefighter.slack.views.modals.base_modal.base import ModalForm
 
 if TYPE_CHECKING:
@@ -57,8 +58,6 @@ class EditMetaModal(ModalForm[EditMetaFormSlack]):
     form_class = EditMetaFormSlack
 
     def build_modal_fn(self, incident: Incident, **kwargs: Any) -> View:
-        from firefighter.incidents.models import Environment
-
         # Get all environments from custom_fields, fallback to single environment
         environments_values = incident.custom_fields.get("environments", [])
         if environments_values:
@@ -90,8 +89,6 @@ class EditMetaModal(ModalForm[EditMetaFormSlack]):
     def handle_modal_fn(  # type: ignore
         self, ack: Ack, body: dict[str, Any], incident: Incident, user: User
     ):
-        from firefighter.incidents.models import Environment
-
         # Get current environments for initial comparison
         environments_values = incident.custom_fields.get("environments", [])
         if environments_values:

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/slack/views/modals/open.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import inspect
 import json
 import logging
 from datetime import timedelta
@@ -293,10 +294,10 @@ class OpenModal(SlackModal):
     def get_done_review_blocks(
         open_incident_context: OpeningData,
         user: User,
-        details_form_done: bool,  # noqa: FBT001
+        details_form_done: bool,
         details_form_class: type[CreateIncidentFormBase] | None,
         details_form: CreateIncidentFormBase | None,
-        can_submit: bool,  # noqa: FBT001
+        can_submit: bool,
     ) -> list[Block]:
         if not can_submit:
             return []
@@ -416,7 +417,6 @@ class OpenModal(SlackModal):
 
         # Pass impacts_data and response_type to form if it supports them (UnifiedIncidentForm)
         # Check if __init__ accepts these parameters
-        import inspect
         init_params = inspect.signature(details_form_class.__init__).parameters
         form_kwargs: dict[str, Any] = {}
         if "impacts_data" in init_params:
@@ -631,7 +631,6 @@ class OpenModal(SlackModal):
             )
             if details_form_class:
                 # Pass impacts_data and response_type to form if it supports them (UnifiedIncidentForm)
-                import inspect
                 init_params = inspect.signature(details_form_class.__init__).parameters
                 form_kwargs: dict[str, Any] = {}
                 if "impacts_data" in init_params:

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/slack/views/modals/opening/check_current_incidents.py

@@ -25,7 +25,6 @@ class CheckCurrentIncidentsModal(
 
     @staticmethod
     def build_modal_fn(body: dict[str, Any], **kwargs: Any) -> View:
-        # ruff: noqa: PLC0415
         from firefighter.slack.views.events.home import _home_incident_element
 
         # Close or back button?

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/slack/views/modals/opening/set_details.py

@@ -138,7 +138,6 @@ class SetIncidentDetails(ModalForm[T], Generic[T]):
 
         if skip_form:
             return
-        # ruff: noqa: PLC0415
         from firefighter.slack.views.modals.open import modal_open
 
         if "priority" in private_metadata and isinstance(

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter/slack/views/modals/trigger_oncall.py

@@ -91,7 +91,6 @@ class OnCallModal(IncidentSelectableModalMixin, SlackModal):
             "view.state.values.oncall_service.select_oncall_service.selected_option.value",
         )
         # TODO Fix the dependency on PagerDuty app
-        # ruff: noqa: PLC0415
         from firefighter.pagerduty.tasks.trigger_oncall import trigger_oncall
 
         service: PagerDutyService | None = PagerDutyService.objects.get(

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/firefighter_tests/test_firefighter/test_logging.py

@@ -5,7 +5,6 @@ import pytest
 
 def test_json_logging(caplog: pytest.LogCaptureFixture, capsys, settings) -> None:
     """This test ensures that JSON logging is working."""
-    # ruff: noqa: PLC0415
     import logging
 
     from firefighter.firefighter.settings.components.logging import (

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/main.py

@@ -30,7 +30,6 @@ class StandaloneApplication(gunicorn.app.wsgiapp.WSGIApplication):
 
 def main() -> None:
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "firefighter.firefighter.settings")
-    # ruff: noqa: PLC0415
     from django import setup
 
     setup()

{firefighter_incident-0.0.32 → firefighter_incident-0.0.34}/pyproject.toml

@@ -167,30 +167,6 @@ celery-beat = {cmd="celery -A firefighter.firefighter beat -l INFO", help="Run t
 switch-test-users = {cmd="ff-manage switch_test_users", help="Generate and apply Slack user mapping for test environment"}
 
 [tool.pdm.dev-dependencies]
-dev = [
-    "mypy>=1.7.1",
-    "pylint>=3.0.2",
-    "pylint-django>=2.5.5",
-    "yamllint>=1.33.0",
-    "django-browser-reload>=1.12.1",
-    "django-silk>=5.0.4",
-    "django-debug-toolbar>=4.2.0",
-    "django-extra-checks>=0.13.3",
-    "nplusone>=1.0.0",
-    "django-migration-linter>=5.0.0",
-    "ipdb>=0.13.13",
-    "ipython>=8.18.1",
-    "djhtml>=3.0.6",
-    "django-extensions>=3.2.3",
-    "pyparsing>=3.1.1",
-    "pydot>=1.4.2",
-    "lazy-object-proxy>=1.9.0",
-    "werkzeug>=3.0.1",
-    "django-watchfiles>=0.1.0",
-    "ruff>=0.1.6",
-    "mypy-to-codeclimate>=0.0.3",
-    "djade>=1.1.1",
-]
 tests = [
     "pytest>=7.4.3",
     "pytest-cov>=4.1.0",
@@ -534,6 +510,8 @@ ignore = [
   "CPY001",  # Missing copyright notice at top of file
   "PLR6301", # XXX Method could be a function or static method -- needs allow list or @override support
   "E203",    # XXX whitespace-before-punctuation -- still unstable with black formatting
+  "PLC0415", # Allow imports inside functions for circular dependencies and optional modules
+  "FBT001",  # Allow boolean positional arguments in function definitions
 ]
 
 # Allow unused variables when underscore-prefixed.
@@ -596,3 +574,29 @@ max-branches = 15
 max-returns = 10
 max-bool-expr = 6
 max-locals = 20
+
+[dependency-groups]
+dev = [
+    "mypy==1.19.1",
+    "pylint>=3.0.2",
+    "pylint-django>=2.5.5",
+    "yamllint>=1.33.0",
+    "django-browser-reload>=1.12.1",
+    "django-silk>=5.0.4",
+    "django-debug-toolbar>=4.2.0",
+    "django-extra-checks>=0.13.3",
+    "nplusone>=1.0.0",
+    "django-migration-linter>=5.0.0",
+    "ipdb>=0.13.13",
+    "ipython>=8.18.1",
+    "djhtml>=3.0.6",
+    "django-extensions>=3.2.3",
+    "pyparsing>=3.1.1",
+    "pydot>=1.4.2",
+    "lazy-object-proxy>=1.9.0",
+    "werkzeug>=3.0.1",
+    "django-watchfiles>=0.1.0",
+    "ruff==0.14.14",
+    "mypy-to-codeclimate>=0.0.3",
+    "djade>=1.1.1",
+]