Merge pull request #51 from specklesystems/kate/2.12

Kate/2.12

.circleci/config.yml

@@ -55,6 +55,21 @@ jobs:
                 root: ./
                 paths:
                   - speckle-sharp-ci-tools/Installers
+  publish-github-release:
+    docker:
+      - image: cimg/base:2021.01
+    steps:
+      - attach_workspace:
+          at: ./speckle_arcgis_installer
+      - run:
+          name: "Publish Release on GitHub"
+          command: |
+            go get github.com/tcnksm/ghr
+            VERSION=$(my-binary --version)
+            $tag = if([string]::IsNullOrEmpty($env:CIRCLE_TAG)) { "0.0.0" } else { $env:CIRCLE_TAG }
+            $semver = if($tag.Contains('/')) {$tag.Split("/")[1] } else { $tag }
+            $ver = if($semver.Contains('-')) {$semver.Split("-")[0] } else { $semver }
+            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} ./speckle_arcgis_installer/speckle_toolbox-$($ver)-py3-none-any.whl
 
   get-ci-tools: # Clones our ci tools and persists them to the workspace
     docker:
@@ -119,6 +134,15 @@ workflows: #happens with every PR to main
                 - main
                 - /ci\/.*/
           context: innosetup
+      - publish-github-release:
+          requires:
+            - build-connector-win
+          filters:
+            tags:
+              only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
+            branches:
+              ignore: /.*/
+          context: innosetup
 
   deploy: # build installers and deploy
     jobs:
@@ -142,6 +166,15 @@ workflows: #happens with every PR to main
             branches:
               ignore: /.*/
           context: innosetup
+      - publish-github-release:
+          requires:
+            - build-deploy-connector-win
+          filters:
+            tags:
+              only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
+            branches:
+              ignore: /.*/
+          context: innosetup
       - deploy-manager2:
           slug: arcgis
           os: Win

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 "-2.11.0-py3-none-any.whl" in str(f))]
+    onlyfiles = [f for f in listdir(mypath) if (isfile(join(mypath, f)) and "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.11.0-py3-none-any.whl" ) 
+    #whl_file = os.path.join(os.path.dirname(__file__), "speckle_toolbox-2.11.3-py3-none-any.whl" ) 
     subprocess_call([newExec, '-m','pip','install','--upgrade', '--force-reinstall', whl_file])
     return
 

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

@@ -213,7 +213,7 @@ def bimVectorLayerToNative(geomList, layerName: str, geomType: str, streamBranch
     active_map = project.activeMap
     
     path = project.filePath.replace("aprx","gdb") #
-    path_bim = "\\".join(project.filePath.split("\\")[:-1]) + "\\Layers_Speckle\\BIM_layers_speckle\\" + streamBranch+ "\\" + layerName + "\\" #arcpy.env.workspace + "\\" #
+    path_bim = "\\".join(project.filePath.split("\\")[:-1]) + "\\Layers_Speckle\\BIM_layers\\" + streamBranch+ "\\" + layerName + "\\" #arcpy.env.workspace + "\\" #
     print(path_bim)
     
     if not os.path.exists(path_bim): os.makedirs(path_bim)
@@ -680,7 +680,7 @@ def rasterLayerToNative(layer: RasterLayer, streamBranch: str, project: ArcGISPr
     rasterHasSr = False
     print(path)
 
-    path_bands = "\\".join(path.split("\\")[:-1]) + "\\Layers_Speckle\\rasters_Speckle\\" + streamBranch 
+    path_bands = "\\".join(path.split("\\")[:-1]) + "\\Layers_Speckle\\raster_bands\\" + streamBranch 
     if not os.path.exists(path_bands): os.makedirs(path_bands)
 
     try: 

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

@@ -334,8 +334,8 @@ def rasterFeatureToSpeckle(selectedLayer: arcLayer, projectCRS: arcpy.SpatialRef
     else: 
         #RGB colorizer 
         root_path = "\\".join(project.filePath.split("\\")[:-1])
-        if not os.path.exists(root_path + '\\Layers_Speckle\\rasters_Speckle'): os.makedirs(root_path + '\\Layers_Speckle\\rasters_Speckle')
-        path_style = root_path + '\\Layers_Speckle\\rasters_Speckle\\' + selectedLayer.name + '_temp.lyrx'
+        if not os.path.exists(root_path + '\\Layers_Speckle\\raster_bands'): os.makedirs(root_path + '\\Layers_Speckle\\raster_bands')
+        path_style = root_path + '\\Layers_Speckle\\raster_bands\\' + selectedLayer.name + '_temp.lyrx'
         symJson = jsonFromLayerStyle(selectedLayer, path_style)
 
         # read from Json

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

@@ -1,5 +1,5 @@
 import json
-from typing import Any, List, Union
+from typing import Any, List, Tuple, Union
 import copy
 import os
 
@@ -163,7 +163,7 @@ def vectorRendererToNative(project: ArcGISProject, active_map, layerGroup, layer
 
             else: return None 
 
-def get_rgb_from_speckle(rgb: int) -> tuple[int, int, int]:
+def get_rgb_from_speckle(rgb: int) -> Tuple[int, int, int]:
     r = g = b = 0
     try: 
         r = (rgb & 0xFF0000) >> 16
@@ -174,7 +174,7 @@ def get_rgb_from_speckle(rgb: int) -> tuple[int, int, int]:
     r,g,b = check_rgb(r,g,b)
     return r,g,b 
 
-def check_rgb(r:int, g:int, b:int) -> tuple[int, int, int]:
+def check_rgb(r:int, g:int, b:int) -> Tuple[int, int, int]:
 
     if not isinstance(r, int) or r<0 or r>255: r=g=b=0
     if not isinstance(g, int) or g<0 or g>255: r=g=b=0
@@ -208,9 +208,9 @@ def rasterRendererToNative(project: ArcGISProject, active_map, layerGroup,  laye
             # multiband raster, CIMRasterRGBColorizer 
             # arcpy doesnt support multiband raster symbology: https://community.esri.com/t5/arcgis-api-for-python-questions/why-does-arcpy-mp-arcgis-pro-2-6-mosaic-dataset/td-p/1016312 
             root_path = "\\".join(project.filePath.split("\\")[:-1])
-            if not os.path.exists(root_path + '\\Layers_Speckle\\rasters_Speckle'): os.makedirs(root_path + '\\Layers_Speckle\\rasters_Speckle')
-            path_style = root_path + '\\Layers_Speckle\\rasters_Speckle\\' + newName + '_old.lyrx'
-            path_style2 = root_path + '\\Layers_Speckle\\rasters_Speckle\\' + newName + '_new.lyrx'
+            if not os.path.exists(root_path + '\\Layers_Speckle\\raster_bands'): os.makedirs(root_path + '\\Layers_Speckle\\raster_bands')
+            path_style = root_path + '\\Layers_Speckle\\raster_bands\\' + newName + '_old.lyrx'
+            path_style2 = root_path + '\\Layers_Speckle\\raster_bands\\' + newName + '_new.lyrx'
             symJson = jsonFromLayerStyle(arcLayer, path_style)
 
         if renderer['type']  == 'singlebandgray':
@@ -308,8 +308,8 @@ def rendererToSpeckle(project: ArcGISProject, active_map, arcLayer, rasterFeat:
         except: 
             rType = "multibandcolor"
             root_path = "\\".join(project.filePath.split("\\")[:-1])
-            if not os.path.exists(root_path + '\\Layers_Speckle\\rasters_Speckle'): os.makedirs(root_path + '\\Layers_Speckle\\rasters_Speckle')
-            path_style = root_path + '\\Layers_Speckle\\rasters_Speckle\\' + arcLayer.name + '_temp.lyrx'
+            if not os.path.exists(root_path + '\\Layers_Speckle\\raster_bands'): os.makedirs(root_path + '\\Layers_Speckle\\raster_bands')
+            path_style = root_path + '\\Layers_Speckle\\raster_bands\\' + arcLayer.name + '_temp.lyrx'
             #path_style2 = root_path + '\\' + newName + '_new.lyrx'
             symJson = jsonFromLayerStyle(arcLayer, path_style)
 

speckle_toolbox/esri/toolboxes/speckle/speckle_arcgis.py

@@ -89,7 +89,7 @@ class Toolbox:
         try: 
             version = arcpy.GetInstallInfo()['Version']
             python_version = f"python {'.'.join(map(str, sys.version_info[:2]))}"
-            metrics.set_host_app("ArcGIS", ', '.join([version, python_version])) 
+            metrics.set_host_app("ArcGIS", ', '.join([f"ArcGIS {version}", python_version])) 
         except: 
             metrics.set_host_app("ArcGIS")
         # https://pro.arcgis.com/en/pro-app/2.8/arcpy/mapping/alphabeticallistofclasses.htm#except: print("something happened")
@@ -127,6 +127,10 @@ class Speckle:
                 break
         if self.toolboxInputs is None: self.toolboxInputs = toolboxInputsClass()
 
+        #print(self.speckleInputs.accounts)
+        if len(self.speckleInputs.accounts) == 0:
+            arcpy.AddError("Speckle accounts not found")
+
     def getParameterInfo(self):
         #data types: https://pro.arcgis.com/en/pro-app/2.8/arcpy/geoprocessing_and_python/defining-parameter-data-types-in-a-python-toolbox.htm
         # parameter details: https://pro.arcgis.com/en/pro-app/latest/arcpy/geoprocessing_and_python/customizing-tool-behavior-in-a-python-toolbox.htm
@@ -147,9 +151,12 @@ class Speckle:
         if isinstance(self.speckleInputs.streams_default, SpeckleException):
             arcpy.AddError("Speckle account not accessible")
             streamsDefalut.filter.list = []
+        elif self.speckleInputs.streams_default is not None:
+            streamsDefalut.filter.list = [ (str(st.name) + " - " + str(st.id)) for st in self.speckleInputs.streams_default ]
         else:
-            streamsDefalut.filter.list = [ (st.name + " - " + st.id) for st in self.speckleInputs.streams_default ]
-
+            streamsDefalut.filter.list = []
+            arcpy.AddError("Error connecting to default Speckle account")
+        
         addDefStreams = arcpy.Parameter(
             displayName="Add",
             name="addDefStreams",
@@ -341,7 +348,7 @@ class Speckle:
                             except: pass
 
                             # query stream, add to saved
-                            stream = self.speckleInputs.speckle_client.stream.get(steamId)
+                            stream = self.speckleInputs.speckle_client.stream.get(id = steamId, branch_limit = 100, commit_limit = 100)
                             if isinstance(stream, Stream): 
                                 print("_____Add by URL___")
                                 wr = StreamWrapper(f"{self.speckleInputs.account.serverInfo.url}/streams/{stream.id}?u={self.speckleInputs.account.userInfo.id}")

speckle_toolbox/esri/toolboxes/speckle/ui/project_vars.py

@@ -5,7 +5,7 @@ from arcpy._mp import ArcGISProject, Map, Layer as arcLayer
 from specklepy.api.models import Branch, Stream, Streams
 import os.path
 
-from specklepy.api.credentials import get_local_accounts
+from specklepy.api.credentials import Account, get_local_accounts
 from specklepy.api.client import SpeckleClient
 from specklepy.logging.exceptions import (
     GraphQLException,
@@ -18,9 +18,9 @@ class speckleInputsClass:
     #def __init__(self):
     print("CREATING speckle inputs first time________")
     instances = []
-    accounts = get_local_accounts()
+    accounts: List[Account] = get_local_accounts()
     account = None
-    streams_default: None or List[Stream] = None 
+    streams_default: Optional[List[Stream]] = None
 
     project = None
     active_map = None
@@ -123,7 +123,7 @@ class speckleInputsClass:
             except: pass
 
             client = sw.get_client()
-            stream = client.stream.get(steamId)
+            stream = client.stream.get(id = steamId, branch_limit = 100, commit_limit = 100)
             if isinstance(stream, GraphQLException):
                 raise SpeckleException(stream.errors[0]['message'])
             return stream

tests/tests_unittest.py

@@ -10,6 +10,13 @@ from specklepy.logging.exceptions import GraphQLException, SpeckleException
 from specklepy.api.credentials import Account
 
 import unittest   # The test framework
+# remove SetUp
+# add different scenqrios for Streqm Wrapper including wrng ones
+# tree of all options for input or class outcome
+# use dict for types chech
+# issue with untestable class init 
+# "mocking objects" for tests or "faking"
+# get functions ut of INIT 
 
 class Test_InitializingClasses(unittest.TestCase):
     def setUp(self) -> None:
@@ -17,7 +24,7 @@ class Test_InitializingClasses(unittest.TestCase):
         self.speckle_input = speckleInputsClass()
         self.toolbox = Toolbox()
         self.speckleTool = Speckle()
-        self.test_stream = "https://speckle.xyz/streams/17b0b76d13"
+        self.test_stream = "https://speckle.xyz/streams////17b0b76d13"
     
     def text_all_toolbox(self):
         self.assertTrue(isinstance(self.toolbox.tools[0], Speckle))
@@ -34,6 +41,17 @@ class Test_InitializingClasses(unittest.TestCase):
         self.assertIsNone(self.toolbox_input.project)
         self.assertEqual(self.toolbox_input.stream_file_path, "")
 
+    def test_something(self):
+        # Arrange
+        toolbox_input: toolboxInputsClass = toolboxInputsClass()
+        
+        # Act
+        toolbox_input.setProjectStreams(StreamWrapper(self.test_stream))
+
+        # Assert
+        os.path.exists(self.toolbox_input.stream_file_path)
+
+
     def test_toolbox_inputs_functions(self):
         self.toolbox_input.setProjectStreams(StreamWrapper(self.test_stream))
         if os.path.exists(self.toolbox_input.stream_file_path):
@@ -48,6 +66,7 @@ class Test_InitializingClasses(unittest.TestCase):
             existing_content = f.read()
             f.close()
             self.assertTrue(isinstance(existing_content, str))
+        self.assertIsInstance()
 
         self.assertTrue( isinstance(self.toolbox_input.get_survey_point(), tuple))
         self.assertTrue( isinstance(self.toolbox_input.get_survey_point()[0], float) or isinstance(self.toolbox_input.get_survey_point()[0], int))