Merge pull request #50 from specklesystems/2.11-fix

typing fixed for older python versions

patch_version.py

@@ -37,7 +37,7 @@ def patch_installer(tag):
         with open(fileName, "r") as file:
             lines = file.readlines()
             for i, line in enumerate(lines):
-                if "-py3-none-any.whl" in line: 
+                if "-py3-none-any.whl" in line and '.sort' not in line: 
                     p1 = line.split("-py3-none-any.whl")[0].split("-")[0]
                     p2 = f'{tag.split("-")[0]}'
                     p3 = line.split("-py3-none-any.whl")[1]

speckle_arcgis_installer/toolbox_install_manual.py

@@ -17,10 +17,10 @@ pythonPath = os.getenv('APPDATA').replace("\\Roaming","") + r"\Local\ESRI\conda\
 def installToolbox(newExec: str):
     print("Installing Speckle Toolbox")
     mypath = os.path.dirname(__file__)
-    onlyfiles = [f for f in listdir(mypath) if (isfile(join(mypath, f)) and "-py3-none-any.whl" in str(f))]
+    onlyfiles = [f for f in listdir(mypath) if (isfile(join(mypath, f)) and "-2.11.0-py3-none-any.whl" in str(f))]
     onlyfiles.sort(key = lambda x: int(x.replace("speckle_toolbox-","").replace("-py3-none-any.whl","").split(".")[1]) ) 
     whl_file = onlyfiles[len(onlyfiles)-1]
-    #whl_file = os.path.join(os.path.dirname(__file__), "speckle_toolbox-2.9.4-py3-none-any.whl" ) 
+    #whl_file = os.path.join(os.path.dirname(__file__), "speckle_toolbox-2.11.0-py3-none-any.whl" ) 
     subprocess_call([newExec, '-m','pip','install','--upgrade', '--force-reinstall', whl_file])
     return
 

speckle_toolbox/esri/toolboxes/speckle/converter/layers/feature.py

@@ -88,9 +88,14 @@ def featureToNative(feature: Base, fields: dict, geomType: str, sr: arcpy.Spatia
         return None
 
     for key, variant in fields.items(): 
+        try: value = feature[key]
+        except: 
+            if key == 'Speckle_ID': value = feature['id'] 
+            else: 
+                arcpy.AddWarning(f'Field {key} not found')
+                return None 
 
-        value = feature[key]
-        if variant == "TEXT": value = str(feature[key]) 
+        if variant == "TEXT": value = str(value) 
         if variant == getVariantFromValue(value) and value != "NULL" and value != "None": 
             feat.update({key: value})
         else: 
@@ -159,7 +164,7 @@ def addFeatVariant(key, variant, value, f):
     elif variant == "TEXT" or variant == "FLOAT" or variant == "LONG" or variant == "SHORT": feat.update({key: None})
     return feat 
 
-def updateFeat(feat:dict, fields: dict, feature: Base) -> dict[str, Any]:
+def updateFeat(feat:dict, fields: dict, feature: Base) -> Dict[str, Any]:
     
     for key, variant in fields.items(): 
         try:

speckle_toolbox/esri/toolboxes/speckle/converter/layers/symbologyTemplates.py

@@ -3,6 +3,8 @@ from typing import Any, List, Union
 import copy
 import os
 
+from typing import Dict
+
 import arcpy 
 from arcpy._mp import ArcGISProject
 from arcpy.management import (CreateFeatureclass, MakeFeatureLayer,
@@ -33,7 +35,7 @@ def symbol_color_to_speckle(color: dict):
     except: pass 
     return newColor
 
-def vectorRendererToNative(project: ArcGISProject, active_map, layerGroup, layerSpeckle: Union[Layer, VectorLayer], layerArcgis, f_class, existingAttrs: List) -> Union[None, dict[str, Any]] :
+def vectorRendererToNative(project: ArcGISProject, active_map, layerGroup, layerSpeckle: Union[Layer, VectorLayer], layerArcgis, f_class, existingAttrs: List) -> Union[None, Dict[str, Any]] :
     print("___________APPLY VECTOR RENDERER______________")
     print(layerArcgis)
     print(f_class)
@@ -311,7 +313,7 @@ def rendererToSpeckle(project: ArcGISProject, active_map, arcLayer, rasterFeat:
             #path_style2 = root_path + '\\' + newName + '_new.lyrx'
             symJson = jsonFromLayerStyle(arcLayer, path_style)
 
-        layerRenderer: dict[str, Any] = {}
+        layerRenderer: Dict[str, Any] = {}
         layerRenderer['type'] = rType
         print(rType)
         my_raster = arcpy.Raster(arcLayer.dataSource)  
@@ -394,7 +396,7 @@ def rendererToSpeckle(project: ArcGISProject, active_map, arcLayer, rasterFeat:
 
         return layerRenderer 
     elif arcLayer.isFeatureLayer: 
-        layerRenderer: dict[str, Any] = {}
+        layerRenderer: Dict[str, Any] = {}
 
         sym = arcLayer.symbology
         print(sym.renderer.type)

speckle_toolbox/esri/toolboxes/speckle/converter/layers/utils.py

@@ -30,7 +30,7 @@ def getVariantFromValue(value: Any) -> Union[str, None]:
 
     return res
 
-def getLayerAttributes(featuresList: List[Base], attrsToRemove: List[str] = ATTRS_REMOVE ) -> dict[str, str]:
+def getLayerAttributes(featuresList: List[Base], attrsToRemove: List[str] = ATTRS_REMOVE ) -> Dict[str, str]:
     print("03________ get layer attributes")
 
     if not isinstance(featuresList, list): features = [featuresList]