Merge pull request #177 from specklesystems/2.17

2.17
specklesystems · Nov 13, 2023 · b1539f2 · b1539f2
2 parents da8097e + 73c1b0d
commit b1539f2
Show file tree

Hide file tree

Showing 6 changed files with 522 additions and 359 deletions.
diff --git a/plugin_utils/installer.py b/plugin_utils/installer.py
@@ -181,6 +181,7 @@ def install_requirements(host_application: str) -> None:
                     str(path),
                     "debugpy==1.8.0",
                 ],
+                shell=True,
                 capture_output=True,
                 text=True,
             )
@@ -213,6 +214,7 @@ def install_requirements(host_application: str) -> None:
             "-r",
             str(get_requirements_path()),
         ],
+        shell=True,
         capture_output=True,
         text=True,
     )

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -9,7 +9,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = ">=3.9, <4.0"
 numpy = "^1.25.2"
-specklepy = "2.17.0"
+specklepy = "2.17.12"
 pyshp = "2.3.1"
 requests = "2.31.0"
 requests-toolbelt = "0.10.1"

diff --git a/speckle/converter/layers/feature.py b/speckle/converter/layers/feature.py
@@ -248,13 +248,14 @@ def addFeatVariant(key, variant, value, f: QgsFeature):
         return feat
     except Exception as e:
         logToUser(e, level=2, func=inspect.stack()[0][3])
-        return
+        return feat
 
 
 def updateFeat(feat: QgsFeature, fields: QgsFields, feature: Base) -> dict[str, Any]:
     try:
         # print("__updateFeat")
-        for i, key in enumerate(fields.names()):
+        all_field_names = fields.names()
+        for i, key in enumerate(all_field_names):
             variant = fields.at(i).type()
             try:
                 if key == "Speckle_ID":
@@ -282,6 +283,7 @@ def updateFeat(feat: QgsFeature, fields: QgsFields, feature: Base) -> dict[str,
                                         {},
                                         rootName + "_" + str(i),
                                         feature[rootName][i],
+                                        1,
                                     )
                                     for i, (key, value) in enumerate(newVals.items()):
                                         for k, (x, y) in enumerate(newF.items()):
@@ -295,7 +297,7 @@ def updateFeat(feat: QgsFeature, fields: QgsFields, feature: Base) -> dict[str,
                         else:
                             try:
                                 newF, newVals = traverseDict(
-                                    {}, {}, rootName, feature[rootName]
+                                    {}, {}, rootName, feature[rootName], 1
                                 )
                                 for i, (key, value) in enumerate(newVals.items()):
                                     for k, (x, y) in enumerate(newF.items()):