chore: Fix type checking

MarekSuchanek · MarekSuchanek · commit 23063c3aff35 · 2026-01-11T13:16:55.000+01:00
diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml
@@ -113,8 +113,9 @@ jobs:
 
     - name: Check typing with MyPy
       run: |
-        mypy --install-types --ignore-missing-imports \
-             --check-untyped-defs --non-interactive \
+        mypy --install-types \
+             --check-untyped-defs \
+             --non-interactive \
              packages/*/dsw
 
   # Consistency of version tagging
diff --git a/Makefile b/Makefile
@@ -0,0 +1,54 @@
+.PHONY: clean
+clean:
+	find . -type f -name '*.pyc' -delete
+	find . -type d -name '__pycache__' -delete
+	find packages -type d -name 'build' -exec rm -rf {} +
+	find packages -type d -name 'dist' -exec rm -rf {} +
+	find packages -type d -name '*.egg-info' -exec rm -rf {} +
+
+.PHONY: install
+install:
+	./scripts/prepare-dev.sh --clean
+	./scripts/build-info.sh
+
+.PHONY: dev-install
+dev-install:
+	pip install -r requirements.dev.txt
+
+.PHONY: code-style
+code-style:
+	flake8 \
+		--count
+		--max-complexity=12
+		--max-line-length=130
+		--statistics \
+		packages
+
+.PHONY: lint
+lint:
+	pylint \
+		--rcfile=.pylintrc.ini \
+		--recursive y \
+		--verbose \
+		packages/*/dsw
+
+.PHONY: spelling
+spelling:
+	cspell \
+		--no-progress \
+		--no-summary \
+		--config .cspell/cspell.json \
+		packages/**/*.py \
+		packages/**/*.md \
+		packages/**/*.json \
+		packages/**/*.toml \
+		packages/**/*.yml \
+		packages/**/*.yaml
+
+.PHONY: type-check
+type-check:
+	mypy \
+		--install-types \
+		--check-untyped-defs \
+		--non-interactive \
+		packages/*/dsw
diff --git a/packages/dsw-command-queue/dsw/command_queue/command_queue.py b/packages/dsw-command-queue/dsw/command_queue/command_queue.py
@@ -6,7 +6,7 @@
 import select
 import signal
 
-import func_timeout
+import func_timeout  # type: ignore
 import psycopg
 import psycopg.generators
 import tenacity
diff --git a/packages/dsw-command-queue/dsw/command_queue/py.typed b/packages/dsw-command-queue/dsw/command_queue/py.typed
diff --git a/packages/dsw-command-queue/pyproject.toml b/packages/dsw-command-queue/pyproject.toml
@@ -40,5 +40,8 @@ zip-safe = false
 [tool.setuptools.packages.find]
 include = ['dsw*']
 
+[tool.setuptools.package-data]
+'dsw.command_queue' = ['py.typed']
+
 [tool.distutils.bdist_wheel]
 universal = true
diff --git a/packages/dsw-config/dsw/config/py.typed b/packages/dsw-config/dsw/config/py.typed
diff --git a/packages/dsw-config/pyproject.toml b/packages/dsw-config/pyproject.toml
@@ -38,5 +38,8 @@ zip-safe = false
 [tool.setuptools.packages.find]
 include = ['dsw*']
 
+[tool.setuptools.package-data]
+'dsw.config' = ['py.typed']
+
 [tool.distutils.bdist_wheel]
 universal = true
diff --git a/packages/dsw-data-seeder/dsw/data_seeder/py.typed b/packages/dsw-data-seeder/dsw/data_seeder/py.typed
diff --git a/packages/dsw-data-seeder/pyproject.toml b/packages/dsw-data-seeder/pyproject.toml
@@ -49,6 +49,9 @@ zip-safe = false
 [tool.setuptools.packages.find]
 include = ['dsw*']
 
+[tool.setuptools.package-data]
+'dsw.data_seeder' = ['py.typed']
+
 [tool.distutils.bdist_wheel]
 universal = true
 
diff --git a/packages/dsw-database/dsw/database/py.typed b/packages/dsw-database/dsw/database/py.typed
diff --git a/packages/dsw-database/pyproject.toml b/packages/dsw-database/pyproject.toml
@@ -39,6 +39,10 @@ zip-safe = false
 
 [tool.setuptools.packages.find]
 include = ['dsw*']
+namespaces = true
+
+[tool.setuptools.package-data]
+'dsw.database' = ['py.typed']
 
 [tool.distutils.bdist_wheel]
-universal = true
+universal = true
diff --git a/packages/dsw-document-worker/dsw/document_worker/py.typed b/packages/dsw-document-worker/dsw/document_worker/py.typed
diff --git a/packages/dsw-document-worker/dsw/document_worker/templates/steps/conversion.py b/packages/dsw-document-worker/dsw/document_worker/templates/steps/conversion.py
@@ -16,7 +16,7 @@ class WeasyPrintStep(Step):
 
     def __init__(self, template, options: dict):
         # pylint: disable-next=import-outside-toplevel
-        import weasyprint
+        import weasyprint  # type: ignore
 
         super().__init__(template, options)
         # PDF options
diff --git a/packages/dsw-document-worker/dsw/document_worker/templates/steps/excel.py b/packages/dsw-document-worker/dsw/document_worker/templates/steps/excel.py
@@ -6,10 +6,10 @@
 import typing
 
 import dateutil.parser
-import xlsxwriter
-from xlsxwriter.chart import Chart
-from xlsxwriter.format import Format
-from xlsxwriter.worksheet import Worksheet
+import xlsxwriter  # type: ignore
+from xlsxwriter.chart import Chart  # type: ignore
+from xlsxwriter.format import Format  # type: ignore
+from xlsxwriter.worksheet import Worksheet  # type: ignore
 
 from ...documents import DocumentFile, FileFormats
 from .base import Step, register_step, TMP_DIR, FormatStepException
diff --git a/packages/dsw-document-worker/dsw/document_worker/templates/templates.py b/packages/dsw-document-worker/dsw/document_worker/templates/templates.py
@@ -121,6 +121,9 @@ def fetch_project_file_dict(self, file: dict) -> Asset | None:
     def _fetch_project_file(self, file_uuid: str, name: str,
                             content_type: str) -> Asset | None:
         LOG.info('Fetching project file "%s"', file_uuid)
+        if self.project_uuid is None:
+            LOG.warning('Project UUID is not set, cannot fetch project file')
+            return None
         file_path = self.template_dir / 'project-files' / file_uuid
         if not file_path.parent.exists():
             file_path.parent.mkdir(parents=True, exist_ok=True)
@@ -271,7 +274,7 @@ def has_format(self, format_uuid: str) -> bool:
     def __getitem__(self, format_uuid: str) -> Format:
         return self.formats[format_uuid]
 
-    def render(self, format_uuid: str, project_uuid: str,
+    def render(self, format_uuid: str, project_uuid: str | None,
                context: dict) -> DocumentFile:
         Context.get().app.pm.hook.enrich_document_context(context=context)
 
diff --git a/packages/dsw-document-worker/dsw/document_worker/worker.py b/packages/dsw-document-worker/dsw/document_worker/worker.py
@@ -188,17 +188,23 @@ def _enrich_context(self):
             extras['submissions'] = [s.to_dict() for s in submissions]
         if self.safe_format.requires_via_extras('questionnaire'):
             # older deprecated variant (questionnaire -> project)
-            questionnaire = self.ctx.app.db.fetch_project_simple(
-                project_uuid=self.safe_doc.project_uuid,
-                tenant_uuid=self.tenant_uuid,
-            )
-            extras['questionnaire'] = questionnaire.to_dict()
+            if self.safe_doc.project_uuid is None:
+                extras['questionnaire'] = None
+            else:
+                questionnaire = self.ctx.app.db.fetch_project_simple(
+                    project_uuid=self.safe_doc.project_uuid,
+                    tenant_uuid=self.tenant_uuid,
+                )
+                extras['questionnaire'] = questionnaire.to_dict()
         if self.safe_format.requires_via_extras('project'):
-            project = self.ctx.app.db.fetch_project_simple(
-                project_uuid=self.safe_doc.project_uuid,
-                tenant_uuid=self.tenant_uuid,
-            )
-            extras['project'] = project.to_dict()
+            if self.safe_doc.project_uuid is None:
+                extras['project'] = None
+            else:
+                project = self.ctx.app.db.fetch_project_simple(
+                    project_uuid=self.safe_doc.project_uuid,
+                    tenant_uuid=self.tenant_uuid,
+                )
+                extras['project'] = project.to_dict()
         self.doc_context['extras'] = extras
         self._enrich_context_config()
 
diff --git a/packages/dsw-document-worker/pyproject.toml b/packages/dsw-document-worker/pyproject.toml
@@ -59,5 +59,8 @@ zip-safe = false
 [tool.setuptools.packages.find]
 include = ['dsw*']
 
+[tool.setuptools.package-data]
+'dsw.document_worker' = ['py.typed']
+
 [tool.distutils.bdist_wheel]
 universal = true
diff --git a/packages/dsw-mailer/dsw/mailer/config.py b/packages/dsw-mailer/dsw/mailer/config.py
@@ -220,7 +220,7 @@ def __init__(self, *, host: str | None = None, port: int | None = None,
             self.security = SMTPSecurityMode[security.upper()]
         elif ssl is not None:
             self.security = SMTPSecurityMode.SSL if ssl else SMTPSecurityMode.PLAIN
-        self.port = port or self._default_port()
+        self.port = port or self.default_port
         self.auth = auth_enabled
         if self.auth is None:
             self.auth = username is not None and password is not None
@@ -248,7 +248,8 @@ def is_ssl(self):
     def is_tls(self):
         return self.security == SMTPSecurityMode.TLS
 
-    def _default_port(self) -> int:
+    @property
+    def default_port(self) -> int:
         if self.is_plain:
             return 25
         if self.is_ssl:
@@ -441,12 +442,18 @@ def merge_mail_configs(cfg: MailerConfig, db_cfg: DBInstanceConfigMail | None) -
             smtp.password = cfg.mail.smtp.password
             smtp.timeout = cfg.mail.smtp.timeout
         else:
+            if db_cfg.smtp_security is None:
+                smtp.security = cfg.mail.smtp.security
+            elif SMTPSecurityMode.has(db_cfg.smtp_security.upper()):
+                smtp.security = SMTPSecurityMode[db_cfg.smtp_security.upper()]
+            else:
+                smtp.security = SMTPSecurityMode.PLAIN
             smtp.host = db_cfg.smtp_host
-            smtp.port = db_cfg.smtp_port
-            smtp.security = db_cfg.smtp_security
+            smtp.port = db_cfg.smtp_port or smtp.default_port
             smtp.username = db_cfg.smtp_username
             smtp.password = db_cfg.smtp_password
-            smtp.timeout = db_cfg.timeout
+            if db_cfg.timeout:
+                smtp.timeout = db_cfg.timeout
     elif db_cfg.provider.lower() == 'amazonses':
         if db_cfg.aws_access_key_id is None and db_cfg.aws_secret_access_key is None:
             amazon_ses.access_key_id = cfg.mail.amazon_ses.access_key_id
@@ -459,13 +466,13 @@ def merge_mail_configs(cfg: MailerConfig, db_cfg: DBInstanceConfigMail | None) -
 
     result = MailConfig(
         enabled=cfg.mail.enabled,
-        name=db_cfg.sender_name,
-        email=db_cfg.sender_email,
+        name=db_cfg.sender_name or cfg.mail.name,
+        email=db_cfg.sender_email or cfg.mail.email,
         provider=db_cfg.provider,
         smtp=smtp,
         amazon_ses=amazon_ses,
-        rate_limit_window=db_cfg.rate_limit_window,
-        rate_limit_count=db_cfg.rate_limit_count,
+        rate_limit_window=db_cfg.rate_limit_window or cfg.mail.rate_limit_window,
+        rate_limit_count=db_cfg.rate_limit_count or cfg.mail.rate_limit_count,
         dkim_privkey_file=None,
         dkim_selector=None,
     )
diff --git a/packages/dsw-mailer/dsw/mailer/py.typed b/packages/dsw-mailer/dsw/mailer/py.typed
diff --git a/packages/dsw-mailer/dsw/mailer/sender/amazon_ses.py b/packages/dsw-mailer/dsw/mailer/sender/amazon_ses.py
@@ -1,6 +1,6 @@
 import logging
 
-import boto3
+import boto3  # type: ignore
 
 from .base import BaseMailSender
 from ..config import MailConfig
diff --git a/packages/dsw-mailer/pyproject.toml b/packages/dsw-mailer/pyproject.toml
@@ -54,6 +54,9 @@ zip-safe = false
 [tool.setuptools.packages.find]
 include = ['dsw*']
 
+[tool.setuptools.package-data]
+'dsw.mailer' = ['py.typed']
+
 [tool.distutils.bdist_wheel]
 universal = true
 
diff --git a/packages/dsw-models/dsw/models/py.typed b/packages/dsw-models/dsw/models/py.typed
diff --git a/packages/dsw-models/pyproject.toml b/packages/dsw-models/pyproject.toml
@@ -38,5 +38,8 @@ zip-safe = false
 [tool.setuptools.packages.find]
 include = ['dsw*']
 
+[tool.setuptools.package-data]
+'dsw.models' = ['py.typed']
+
 [tool.distutils.bdist_wheel]
 universal = true
diff --git a/packages/dsw-storage/dsw/storage/py.typed b/packages/dsw-storage/dsw/storage/py.typed
diff --git a/packages/dsw-storage/pyproject.toml b/packages/dsw-storage/pyproject.toml
@@ -40,5 +40,8 @@ zip-safe = false
 [tool.setuptools.packages.find]
 include = ['dsw*']
 
+[tool.setuptools.package-data]
+'dsw.storage' = ['py.typed']
+
 [tool.distutils.bdist_wheel]
 universal = true
diff --git a/packages/dsw-tdk/dsw/tdk/py.typed b/packages/dsw-tdk/dsw/tdk/py.typed
diff --git a/packages/dsw-tdk/pyproject.toml b/packages/dsw-tdk/pyproject.toml
@@ -58,7 +58,8 @@ zip-safe = false
 include = ['dsw*']
 
 [tool.setuptools.package-data]
-"*" = ["*.j2"]
+'*' = ['*.j2']
+'dsw.tdk' = ['*.j2', 'py.typed']
 
 [tool.distutils.bdist_wheel]
 universal = true
