typings

speckle/converter/features/utils.py

@@ -1,6 +1,6 @@
 import inspect
 import random
-from typing import Any
+from typing import Any, Union
 from speckle.converter.layers.utils import getVariantFromValue, traverseDict
 
 from speckle.utils.panel_logging import logToUser
@@ -36,9 +36,7 @@ def addFeatVariant(key, variant, value, f: "QgsFeature") -> "QgsFeature":
         return feat
 
 
-def updateFeat(
-    feat: "QgsFeature", fields: "QgsFields", feature: Base
-) -> dict[str, Any]:
+def updateFeat(feat: "QgsFeature", fields: "QgsFields", feature: Base) -> "QgsFeature":
     try:
         # print("__updateFeat")
         all_field_names = fields.names()
@@ -107,7 +105,7 @@ def updateFeat(
 
 def getPolygonFeatureHeight(
     feature: "QgsFeature", layer: "QgsVectorLayer", dataStorage: "DataStorage"
-):
+) -> Union[int, float, None]:
     height = None
     ignore = False
     if dataStorage.savedTransforms is not None:

speckle/converter/geometry/conversions.py

@@ -4,7 +4,7 @@
     GisPolygonElement,
 )
 
-from typing import List, Sequence, Union
+from typing import List, Sequence, Tuple, Union
 import inspect
 
 try:
@@ -74,11 +74,11 @@
 
 def convertToSpeckle(
     feature: "QgsFeature", layer: "QgsVectorLayer" or "QgsRasterLayer", dataStorage
-) -> Union[Base, Sequence[Base], None]:
+) -> Tuple[Union[Base, Sequence[Base], None], Union[int, None]]:
     """Converts the provided layer feature to Speckle objects"""
     try:
         iterations = 0
-        sourceCRS = layer.crs() 
+        sourceCRS = layer.crs()
         targetCRS = dataStorage.project.crs()
         xform = None
         if sourceCRS != targetCRS:
@@ -151,7 +151,7 @@ def convertToSpeckle(
                 result = [result]
             element = GisPolygonElement(units=units, geometry=result)
             return element, iterations
-        
+
         elif geomType == QgsWkbTypes.PolygonGeometry:  # 2
             height = getPolygonFeatureHeight(feature, layer, dataStorage)
             elevationLayer = getElevationLayer(dataStorage)
@@ -276,7 +276,13 @@ def convertToSpeckle(
                                 continue
 
                     polygon, iterations = polygonToSpeckle(
-                        poly, feature, layer, height, translationZaxis, dataStorage, xform
+                        poly,
+                        feature,
+                        layer,
+                        height,
+                        translationZaxis,
+                        dataStorage,
+                        xform,
                     )
                     result.append(polygon)
                 for r in result:
@@ -427,7 +433,9 @@ def multiPolygonToNative(items: List[Base], dataStorage) -> "QgsMultiPolygon":
         return None
 
 
-def convertToNativeMulti(items: List[Base], dataStorage):
+def convertToNativeMulti(
+    items: List[Base], dataStorage
+) -> Union["QgsMultiPoint", "QgsMultiLineString", "QgsMultiPolygon", None]:
     try:
         first = items[0]
         if isinstance(first, Point):

speckle/converter/geometry/mesh.py

@@ -1,5 +1,5 @@
 import inspect
-from typing import List, Union
+from typing import List, Tuple, Union
 from specklepy.objects.geometry import Mesh, Point
 from specklepy.objects.other import RenderMaterial
 
@@ -189,7 +189,13 @@ def meshPartsFromPolygon(
     layer: "QgsVectorLayer",
     height,
     dataStorage,
-):
+) -> Tuple[
+    Union[int, None],
+    Union[List[float], None],
+    Union[List[int], None],
+    Union[List[int], None],
+    Union[int, None],
+]:
     try:
         faces = []
         faces_cap = []

speckle/converter/geometry/transform.py

@@ -22,7 +22,7 @@ def transform(
     src: "QgsPointXY",
     crsSrc: "QgsCoordinateReferenceSystem",
     crsDest: "QgsCoordinateReferenceSystem",
-):
+) -> "QgsPointXY":
     """Transforms a QgsPointXY from the source CRS to the destination."""
     try:
         transformContext = project.transformContext()

speckle/ui_widgets/dockwidget_main.py

@@ -64,7 +64,6 @@ def onStreamRemoveButtonClicked(self, plugin):
             plugin.active_stream = None
             self.streamBranchDropdown.clear()
             self.commitDropdown.clear()
-            # self.streamIdField.setText("")
 
             set_project_streams(plugin)
             self.populateProjectStreams(plugin)
@@ -104,13 +103,7 @@ def populateProjectStreams(self, plugin):
             return
 
     def cancelOperations(self):
-        # print("____cancelOperations______")
         for t in threading.enumerate():
-            # print(t.name)
             if "speckle_" in t.name:
-                # print(f"thread to kill: {t}")
                 t.kill()
                 t.join()
-        # not printed if same thread
-        # print("Remaining threads: ")
-        # print(threading.enumerate())

speckle/ui_widgets/widget_transforms.py

@@ -43,8 +43,6 @@ def runSetup(self):
         self.populateSavedTransforms(self.dataStorage)
         self.populateSavedElevationLayer(self.dataStorage)
 
-        # self.elevationLayerDropdown.currentIndexChanged.connect(self.saveElevationLayer)
-
     def populateSavedTransforms(
         self, dataStorage
     ):  # , savedTransforms: Union[List, None] = None, getLayer: Union[str, None] = None, getTransform: Union[str, None] = None):

speckle/utils/panel_logging.py

@@ -41,7 +41,7 @@ def log(self, message: str, level: int = 0):
                 level = Qgis.Critical
             # return
             QgsMessageLog.logMessage(message, "Speckle", level=level)
-        except ImportError:
+        except ImportError or ModuleNotFoundError:
             pass
         except Exception as e:
             try: