Type hints for dbconnector

Type hints for iliwrapper

Typehints for generator

Type hints for utils

Type hints for ilitoppingmaker

Author: signedav

.docker/docker-compose.gh.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   postgres13:
     image: postgis/postgis:13-3.4-alpine

modelbaker/dataobjects/layers.py

@@ -41,18 +41,18 @@
 class Layer:
     def __init__(
         self,
-        provider: str = None,
-        uri: str = None,
-        name: str = None,
+        provider: Optional[str] = None,
+        uri: Optional[str] = None,
+        name: Optional[str] = None,
         srid: Optional[int] = None,
         extent: Optional[str] = None,
-        geometry_column: str = None,
+        geometry_column: Optional[str] = None,
         wkb_type: QgsWkbTypes = QgsWkbTypes.Type.Unknown,
         alias: Optional[str] = None,
         is_domain: bool = False,  # is enumeration or catalogue
         is_structure: bool = False,
         is_nmrel: bool = False,
-        display_expression: str = None,
+        display_expression: Optional[str] = None,
         coordinate_precision: Optional[float] = None,
         is_basket_table: bool = False,
         is_dataset_table: bool = False,
@@ -68,7 +68,7 @@ def __init__(
         qmlstylefile: Optional[str] = None,
         styles: dict[str, dict[str, str]] = {},
         is_enum: bool = False,
-        base_class: str = None,
+        base_class: Optional[str] = None,
         provider_names_map: dict[
             str, str
         ] = {},  # provider specific column names (e.g. T_Id vs t_id)

modelbaker/dataobjects/legend.py

@@ -29,9 +29,9 @@
 class LegendGroup:
     def __init__(
         self,
-        name: str = None,
+        name: Optional[str] = None,
         expanded: bool = True,
-        ignore_node_names: bool = None,
+        ignore_node_names: bool = False,
         static_sorting: bool = False,
     ) -> None:
         self.name = name

modelbaker/db_factory/db_command_config_manager.py

@@ -14,6 +14,7 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
+from typing import Optional
 
 from ..iliwrapper.ili2dbconfig import (
     Ili2DbCommandConfiguration,
@@ -38,7 +39,7 @@ def __init__(self, configuration: Ili2DbCommandConfiguration) -> None:
 
     @abstractmethod
     def get_uri(
-        self, su: bool = False, qgis: bool = False, fallback_user: str = None
+        self, su: bool = False, qgis: bool = False, fallback_user: Optional[str] = None
     ) -> str:
         """Gets database uri (connection string) for db connectors (:class:`DBConnector`).
 

modelbaker/db_factory/db_factory.py

@@ -73,7 +73,9 @@ def pre_generate_project(
 
     @abstractmethod
     def post_generate_project_validations(
-        self, configuration: Ili2DbCommandConfiguration, fallback_user: str = None
+        self,
+        configuration: Ili2DbCommandConfiguration,
+        fallback_user: Optional[str] = None,
     ) -> tuple[bool, str]:
         """This method will be called after an operation of generate project is executed.
 

modelbaker/db_factory/gpkg_command_config_manager.py

@@ -13,6 +13,8 @@
 
 from __future__ import annotations
 
+from typing import Optional
+
 from qgis.PyQt.QtCore import QSettings
 
 from ..iliwrapper.ili2dbconfig import Ili2DbCommandConfiguration
@@ -33,7 +35,7 @@ def __init__(self, configuration: Ili2DbCommandConfiguration) -> None:
         DbCommandConfigManager.__init__(self, configuration)
 
     def get_uri(
-        self, su: bool = False, qgis: bool = False, fallback_user: str = None
+        self, su: bool = False, qgis: bool = False, fallback_user: Optional[str] = None
     ) -> str:
         return self.configuration.dbfile
 

modelbaker/db_factory/gpkg_factory.py

@@ -42,7 +42,9 @@ def pre_generate_project(
         return True, ""
 
     def post_generate_project_validations(
-        self, configuration: Ili2DbCommandConfiguration, fallback_user: str = None
+        self,
+        configuration: Ili2DbCommandConfiguration,
+        fallback_user: Optional[str] = None,
     ) -> tuple[bool, str]:
         return True, ""
 

modelbaker/db_factory/mssql_command_config_manager.py

@@ -13,6 +13,8 @@
 
 from __future__ import annotations
 
+from typing import Optional
+
 from qgis.PyQt.QtCore import QSettings
 
 from ..iliwrapper.ili2dbconfig import Ili2DbCommandConfiguration
@@ -27,7 +29,7 @@ def __init__(self, configuration: Ili2DbCommandConfiguration) -> None:
         DbCommandConfigManager.__init__(self, configuration)
 
     def get_uri(
-        self, su: bool = False, qgis: bool = False, fallback_user: str = None
+        self, su: bool = False, qgis: bool = False, fallback_user: Optional[str] = None
     ) -> str:
         separator = ";"
         uri = []

modelbaker/db_factory/mssql_factory.py

@@ -41,7 +41,9 @@ def pre_generate_project(
         return True, ""
 
     def post_generate_project_validations(
-        self, configuration: Ili2DbCommandConfiguration, fallback_user: str = None
+        self,
+        configuration: Ili2DbCommandConfiguration,
+        fallback_user: Optional[str] = None,
     ) -> tuple[bool, str]:
         return True, ""
 

modelbaker/db_factory/pg_command_config_manager.py

@@ -13,6 +13,8 @@
 
 from __future__ import annotations
 
+from typing import Optional
+
 from qgis.PyQt.QtCore import QSettings
 
 from ..iliwrapper.ili2dbconfig import Ili2DbCommandConfiguration
@@ -34,7 +36,7 @@ def __init__(self, configuration: Ili2DbCommandConfiguration) -> None:
         DbCommandConfigManager.__init__(self, configuration)
 
     def get_uri(
-        self, su: bool = False, qgis: bool = False, fallback_user: str = None
+        self, su: bool = False, qgis: bool = False, fallback_user: Optional[str] = None
     ) -> str:
         uri = []