pop-up warning

2.18 fixes for arcgis

qt_ui/DataStorage.py

@@ -3,7 +3,11 @@ import inspect
 from typing import List, Optional, Tuple, Union, Any
 import webbrowser
 
-from speckle.utils.panel_logging import logToUser
+try:
+    from specklepy_qt_ui.qt_ui.utils.logger import logToUser
+except ModuleNotFoundError:
+    from speckle.specklepy_qt_ui.qt_ui.utils.logger import logToUser
+
 from specklepy.core.api.credentials import get_local_accounts
 
 
@@ -18,6 +22,7 @@ class DataStorage:
     currentCRS = None
     currentUnits = "m"
     currentOriginalUnits = ""
+    workspace = ""
 
     custom_lat: Optional[float] = None
     custom_lon: Optional[float] = None
@@ -49,6 +54,9 @@ class DataStorage:
     latestActionLayers: Optional[list] = None
     latestActionUnits: str = ""
 
+    flat_report_receive: dict = {}
+    flat_report_latest: dict = {}
+
     def __init__(self):
         # print("hello")
         # self.streamsToFollow.append(("https://speckle.xyz/streams/17b0b76d13/branches/random_tests", "", "09a0f3e41a"))

qt_ui/LogWidget.py

@@ -9,19 +9,38 @@ import webbrowser
 from specklepy.logging import metrics
 from specklepy.core.api.credentials import Account
 
-from specklepy_qt_ui.qt_ui.global_resources import (
-    BACKGR_COLOR,
-    BACKGR_COLOR_LIGHT,
-    BACKGR_COLOR_GREY,
-    BACKGR_COLOR_TRANSPARENT,
-    BACKGR_COLOR_HIGHLIGHT,
-    NEW_GREY,
-    NEW_GREY_HIGHLIGHT,
-    BACKGR_ERROR_COLOR,
-    BACKGR_ERROR_COLOR_LIGHT,
-)
-from specklepy_qt_ui.qt_ui.widget_dependencies_upgrade import DependenciesUpgradeDialog
-from specklepy_qt_ui.qt_ui.widget_report import ReportDialog
+try:
+    from specklepy_qt_ui.qt_ui.utils.global_resources import (
+        BACKGR_COLOR,
+        BACKGR_COLOR_LIGHT,
+        BACKGR_COLOR_GREY,
+        BACKGR_COLOR_TRANSPARENT,
+        BACKGR_COLOR_HIGHLIGHT,
+        NEW_GREY,
+        NEW_GREY_HIGHLIGHT,
+        BACKGR_ERROR_COLOR,
+        BACKGR_ERROR_COLOR_LIGHT,
+    )
+    from specklepy_qt_ui.qt_ui.widget_dependencies_upgrade import (
+        DependenciesUpgradeDialog,
+    )
+    from specklepy_qt_ui.qt_ui.widget_report import ReportDialog
+except ModuleNotFoundError:
+    from speckle.specklepy_qt_ui.qt_ui.utils.global_resources import (
+        BACKGR_COLOR,
+        BACKGR_COLOR_LIGHT,
+        BACKGR_COLOR_GREY,
+        BACKGR_COLOR_TRANSPARENT,
+        BACKGR_COLOR_HIGHLIGHT,
+        NEW_GREY,
+        NEW_GREY_HIGHLIGHT,
+        BACKGR_ERROR_COLOR,
+        BACKGR_ERROR_COLOR_LIGHT,
+    )
+    from speckle.specklepy_qt_ui.qt_ui.widget_dependencies_upgrade import (
+        DependenciesUpgradeDialog,
+    )
+    from speckle.specklepy_qt_ui.qt_ui.widget_report import ReportDialog
 
 
 class LogWidget(QWidget):
@@ -268,20 +287,22 @@ class LogWidget(QWidget):
 
     def getNextBtn(self):
         index = len(self.used_btns)  # get the next "free" button
-        # print(index)
-        # print(self.btns)
-
         if index >= len(self.btns):
             # remove first button
             print(self.layout.itemAt(0).widget())
             self.layout.itemAt(0).widget().setParent(None)
-
-            # self.used_btns.clear()
             self.createBtns()
             index = 0
-
         btn = self.btns[index]
-        # print(btn)
+
+        return btn, index
+
+    def getLastBtn(self):
+        index = len(self.used_btns) - 1  # get the next "free" button
+        btn = None
+        if index > 0:
+            btn = self.btns[index]
+
         return btn, index
 
     def getBtnByKeyword(self, keyword: str):

qt_ui/dockwidget_main.py

@@ -4,37 +4,71 @@ from copy import copy
 import inspect
 import os
 
-from specklepy_qt_ui.qt_ui.widget_transforms import MappingSendDialog
-from specklepy_qt_ui.qt_ui.LogWidget import LogWidget
-from specklepy_qt_ui.qt_ui.logger import logToUser
-from specklepy_qt_ui.qt_ui.utils import constructCommitURL
-from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
-from specklepy_qt_ui.qt_ui.global_resources import (
-    COLOR_HIGHLIGHT,
-    SPECKLE_COLOR,
-    SPECKLE_COLOR_LIGHT,
-    ICON_OPEN_WEB,
-    ICON_REPORT,
-    ICON_LOGO,
-    ICON_SEARCH,
-    ICON_DELETE,
-    ICON_DELETE_BLUE,
-    ICON_SEND,
-    ICON_RECEIVE,
-    ICON_SEND_BLACK,
-    ICON_RECEIVE_BLACK,
-    ICON_SEND_BLUE,
-    ICON_RECEIVE_BLUE,
-    COLOR,
-    BACKGR_COLOR,
-    BACKGR_COLOR_LIGHT,
-    ICON_XXL,
-    ICON_RASTER,
-    ICON_POLYGON,
-    ICON_LINE,
-    ICON_POINT,
-    ICON_GENERIC,
-)
+try:
+    from specklepy_qt_ui.qt_ui.widget_transforms import MappingSendDialog
+    from specklepy_qt_ui.qt_ui.LogWidget import LogWidget
+    from specklepy_qt_ui.qt_ui.utils.logger import logToUser
+    from specklepy_qt_ui.qt_ui.utils.utils import constructCommitURL
+    from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
+    from specklepy_qt_ui.qt_ui.utils.global_resources import (
+        COLOR_HIGHLIGHT,
+        SPECKLE_COLOR,
+        SPECKLE_COLOR_LIGHT,
+        ICON_OPEN_WEB,
+        ICON_REPORT,
+        ICON_LOGO,
+        ICON_SEARCH,
+        ICON_DELETE,
+        ICON_DELETE_BLUE,
+        ICON_SEND,
+        ICON_RECEIVE,
+        ICON_SEND_BLACK,
+        ICON_RECEIVE_BLACK,
+        ICON_SEND_BLUE,
+        ICON_RECEIVE_BLUE,
+        COLOR,
+        BACKGR_COLOR,
+        BACKGR_COLOR_LIGHT,
+        ICON_XXL,
+        ICON_RASTER,
+        ICON_POLYGON,
+        ICON_LINE,
+        ICON_POINT,
+        ICON_GENERIC,
+    )
+except ModuleNotFoundError: 
+    from speckle.specklepy_qt_ui.qt_ui.widget_transforms import MappingSendDialog
+    from speckle.specklepy_qt_ui.qt_ui.LogWidget import LogWidget
+    from speckle.specklepy_qt_ui.qt_ui.utils.logger import logToUser
+    from speckle.specklepy_qt_ui.qt_ui.utils.utils import constructCommitURL
+    from speckle.specklepy_qt_ui.qt_ui.DataStorage import DataStorage
+    from speckle.specklepy_qt_ui.qt_ui.utils.global_resources import (
+        COLOR_HIGHLIGHT,
+        SPECKLE_COLOR,
+        SPECKLE_COLOR_LIGHT,
+        ICON_OPEN_WEB,
+        ICON_REPORT,
+        ICON_LOGO,
+        ICON_SEARCH,
+        ICON_DELETE,
+        ICON_DELETE_BLUE,
+        ICON_SEND,
+        ICON_RECEIVE,
+        ICON_SEND_BLACK,
+        ICON_RECEIVE_BLACK,
+        ICON_SEND_BLUE,
+        ICON_RECEIVE_BLUE,
+        COLOR,
+        BACKGR_COLOR,
+        BACKGR_COLOR_LIGHT,
+        ICON_XXL,
+        ICON_RASTER,
+        ICON_POLYGON,
+        ICON_LINE,
+        ICON_POINT,
+        ICON_GENERIC,
+    )
+
 from specklepy.logging.exceptions import SpeckleException, GraphQLException
 from specklepy.logging import metrics
 
@@ -346,11 +380,7 @@ class SpeckleQGISDialog(QtWidgets.QDockWidget, FORM_CLASS):
             # print("setupOnFirstLoad")
             self.msgLog.sendMessage.connect(self.addMsg)
             self.setMapping.clicked.connect(self.showMappingDialog)
-            # print("before")
-            # print(self.reportBtn)
-            # print(self.msgLog)
             self.reportBtn.clicked.connect(self.msgLog.showReport)
-            # print("after")
 
             self.streams_add_button.clicked.connect(plugin.onStreamAddButtonClicked)
             self.commit_web_view.clicked.connect(

qt_ui/ui/mainWindow_main.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>SpeckleQArcGISDialog</class>
- <widget class="QMainWindow" name="SpeckleQArcGISDialog">
+ <class>SpeckleGISDialog</class>
+ <widget class="QMainWindow" name="SpeckleGISDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -98,9 +98,21 @@
          </widget>
         </item>
         <item row="3" column="1">
-         <widget class="QComboBox" name="commitDropdown"/>
-        </item>
+          <layout class="QHBoxLayout" name="commitListButtons" stretch="20,1">
+            <item>
+              <widget class="QComboBox" name="commitDropdown"/>
+            </item>
         
+            <item>
+              <widget class="QPushButton" name="commit_web_view">
+                <property name="text">
+                <string> </string>
+                </property>
+              </widget>
+            </item>
+          </layout>
+        </item>
+
         <item row="4" column="1">
           <layout class="QHBoxLayout" name="horizontalLayout">
          </layout>
@@ -126,6 +138,15 @@
             </property>
            </widget>
           </item>
+          
+          <item>
+            <widget class="QPushButton" name="reportBtn">
+              <property name="enabled">
+                <bool>true</bool>
+              </property>
+            </widget>
+          </item>
+
          </layout>
         </item>
 
@@ -178,21 +199,49 @@
                   <bool>true</bool>
                 </property>
                 <property name="text">
-                  <string>Set visible layers as selection</string>
+                  <string>Save visible layers as selection</string>
                 </property>
               </widget>
             </item>
           </layout>
         </item>
 
-        <item row="9" column="0">
+
+        <item row="10" column="1">
+          <layout class="QHBoxLayout" name="horizontalLayout"  stretch="1,1">
+            <item>
+            <spacer name="horizontalSpacer">
+              <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeType">
+              <enum>QSizePolicy::Expanding</enum>
+              </property>
+            </spacer>
+            </item>
+
+            <item>
+              <widget class="QPushButton" name="crsSettings">
+                <property name="enabled">
+                  <bool>true</bool>
+                </property>
+                <property name="text">
+                  <string>Set project center on Send/Receive</string>
+                </property>
+              </widget>
+            </item>
+
+          </layout>
+        </item>
+
+        <item row="11" column="0">
          <widget class="QLabel" name="messageLabel">
           <property name="text">
            <string>Message</string>
           </property>
          </widget>
         </item>
-        <item row="9" column="1">
+        <item row="11" column="1">
          <widget class="QLineEdit" name="messageInput">
           <property name="placeholderText">
            <string>Sent XXX objects from ArcGIS</string>
@@ -202,7 +251,7 @@
 
         
 
-        <item row="10" column="1">
+        <item row="12" column="1">
          <layout class="QHBoxLayout" name="horizontalLayout">
           <item>
           <spacer name="horizontalSpacer">
@@ -236,46 +285,8 @@
 
          </layout>
         </item>
-
-        <item row="11" column="0">
-         <widget class="QLabel" name="surveyPointLabel">
-          <property name="text">
-           <string>Lat, Lon</string>
-          </property>
-         </widget>
-        </item>
-        <item row="11" column="1">
-          <layout class="QHBoxLayout" name="horizontalLayout">
-            <item>
-              <widget class="QLineEdit" name="surveyPointLat">
-                <property name="placeholderText">
-                <string>0.0</string>
-                </property>
-              </widget>
-            </item>
-            <item>
-              <widget class="QLineEdit" name="surveyPointLon">
-                <property name="placeholderText">
-                <string>0.0</string>
-                </property>
-              </widget>
-            </item>
-
-            <item>
-              <widget class="QPushButton" name="saveSurveyPoint">
-                <property name="enabled">
-                  <bool>true</bool>
-                </property>
-                <property name="text">
-                  <string>Set as a project center</string>
-                </property>
-              </widget>
-            </item>
-
-          </layout>
-        </item>
         
-        <item row="12" column="1">
+        <item row="13" column="1">
           <layout class="QHBoxLayout" name="horizontalLayout">
             
             <item>

qt_ui/utils/global_resources.py

@@ -81,3 +81,10 @@ ICON_POINT = os.path.join(
 ICON_GENERIC = os.path.join(
     os.path.dirname(os.path.abspath(__file__)), "assets", "legend_generic.png"
 )
+ICON_PIN_ACTIVE = os.path.join(
+    os.path.dirname(os.path.abspath(__file__)), "assets", "pin.png"
+)
+ICON_PIN_DISABLED = os.path.join(
+    os.path.dirname(os.path.abspath(__file__)), "assets", "pin-outline.png"
+)
+

qt_ui/utils/logger.py

@@ -1,7 +1,7 @@
-from PyQt5.QtWidgets import QMessageBox
-from PyQt5 import QtCore
-
-from specklepy_qt_ui.qt_ui.utils import splitTextIntoLines
+try:
+    from specklepy_qt_ui.qt_ui.utils.utils import splitTextIntoLines
+except ModuleNotFoundError:
+    from speckle.specklepy_qt_ui.qt_ui.utils.utils import splitTextIntoLines
 
 
 def logToUser(
@@ -55,6 +55,9 @@ def displayUserMsg(msg: str, func=None, level: int = 2):
 
 def createWindow(msg_old: str, func=None, level: int = 2):
     # print("Create window")
+    from PyQt5.QtWidgets import QMessageBox
+    from PyQt5 import QtCore
+
     window = None
     try:
         # https://www.techwithtim.net/tutorials/pyqt5-tutorial/messageboxes/

qt_ui/utils/utils.py

@@ -1,10 +1,11 @@
 from textwrap import wrap
+from typing import Union
 import requests
 
+SYMBOL = "_x_x_"
+
 
 def splitTextIntoLines(text: str = "", number: int = 40) -> str:
-    # print("__splitTextIntoLines")
-    # print(text)
     msg = ""
     try:
         if len(text) > number:
@@ -28,8 +29,10 @@ def splitTextIntoLines(text: str = "", number: int = 40) -> str:
 
 
 def constructCommitURL(
-    streamWrapper, branch_id: str = None, commit_id: str = None
-) -> str:
+    streamWrapper,
+    branch_id: Union[str, None] = None,
+    commit_id: Union[str, None] = None,
+) -> Union[str, None]:
     import requests
 
     try:
@@ -41,7 +44,7 @@ def constructCommitURL(
         url = streamUrl
         # check for frontend2
         try:
-            header = r.headers["x-speckle-frontend-2"]
+            header = r.headers["x-speckle-frontend-2"]  # will throw Exception in FE1
             url = (
                 streamUrl.replace("streams", "projects")
                 + "/models/"
@@ -53,7 +56,7 @@ def constructCommitURL(
             url = streamUrl.replace("projects", "streams") + "/commits/" + commit_id
         return url
     except:
-        pass
+        return None
 
 
 def constructCommitURLfromServerCommit(serverURL: str, stream_id: str) -> str:
@@ -71,8 +74,3 @@ def constructCommitURLfromServerCommit(serverURL: str, stream_id: str) -> str:
     except KeyError:
         url = serverURL + "/streams/" + stream_id
     return url
-
-
-# def removeSpecialCharacters(text: str) -> str:
-#    new_text = text.replace("[","_").replace("]","_").replace(" ","_").replace("-","_").replace("(","_").replace(")","_").replace(":","_").replace("\\","_").replace("/","_").replace("\"","_").replace("&","_").replace("@","_").replace("$","_").replace("%","_").replace("^","_")
-#    return new_text

qt_ui/widget_add_stream.py

@@ -3,8 +3,16 @@ import os
 from typing import List, Union
 import urllib.parse
 
-from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
-from specklepy_qt_ui.qt_ui.logger import logToUser
+try:
+    from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
+    from specklepy_qt_ui.qt_ui.utils.logger import logToUser
+    from specklepy_qt_ui.qt_ui.utils.utils import constructCommitURLfromServerCommit
+    from specklepy_qt_ui.qt_ui.utils.logger import displayUserMsg
+except ModuleNotFoundError: 
+    from speckle.specklepy_qt_ui.qt_ui.DataStorage import DataStorage
+    from speckle.specklepy_qt_ui.qt_ui.utils.logger import logToUser
+    from speckle.specklepy_qt_ui.qt_ui.utils.utils import constructCommitURLfromServerCommit
+    from speckle.specklepy_qt_ui.qt_ui.utils.logger import displayUserMsg
 
 from PyQt5 import QtWidgets, uic, QtCore
 from PyQt5.QtCore import pyqtSignal
@@ -16,7 +24,6 @@ from specklepy.core.api.credentials import get_local_accounts  # , StreamWrapper
 from specklepy.core.api.wrapper import StreamWrapper
 from specklepy.logging import metrics
 
-from specklepy_qt_ui.qt_ui.utils import constructCommitURLfromServerCommit
 
 # This loads your .ui file so that PyQt can populate your plugin with the elements from Qt Designer
 FORM_CLASS, _ = uic.loadUiType(
@@ -184,6 +191,10 @@ class AddStreamModalDialog(QtWidgets.QWidget, FORM_CLASS):
 
         except Exception as e:
             logToUser(e, level=2, func=inspect.stack()[0][3])
+            if isinstance(e, SpeckleException):
+                displayUserMsg(e.message, level=2)
+            else:
+                displayUserMsg(str(e), level=2)
             return
 
     def populateResultsList(self, sw=None):

qt_ui/widget_create_branch.py

@@ -1,7 +1,11 @@
 import inspect
 import os
 from typing import List, Tuple, Union
-from specklepy_qt_ui.qt_ui.logger import logToUser
+
+try:
+    from specklepy_qt_ui.qt_ui.utils.logger import logToUser
+except ModuleNotFoundError: 
+    from speckle.specklepy_qt_ui.qt_ui.utils.logger import logToUser
 
 from PyQt5 import QtWidgets, uic, QtCore
 from PyQt5.QtCore import pyqtSignal

qt_ui/widget_create_stream.py

@@ -1,7 +1,11 @@
 import inspect
 import os
 from typing import List, Tuple, Union
-from specklepy_qt_ui.qt_ui.logger import logToUser
+
+try:
+    from specklepy_qt_ui.qt_ui.utils.logger import logToUser
+except ModuleNotFoundError: 
+    from speckle.specklepy_qt_ui.qt_ui.utils.logger import logToUser
 
 from PyQt5 import QtWidgets, uic, QtCore
 from PyQt5.QtCore import pyqtSignal

qt_ui/widget_custom_crs.py

@@ -1,80 +1,91 @@
 import inspect
 import os
 from typing import List, Tuple, Union
-from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
-from specklepy_qt_ui.qt_ui.logger import logToUser
+
+try:
+    from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
+    from specklepy_qt_ui.qt_ui.utils.logger import logToUser
+    from specklepy_qt_ui.qt_ui.utils.global_resources import COLOR
+except ModuleNotFoundError:
+    from speckle.specklepy_qt_ui.qt_ui.DataStorage import DataStorage
+    from speckle.specklepy_qt_ui.qt_ui.utils.logger import logToUser
+    from speckle.specklepy_qt_ui.qt_ui.utils.global_resources import COLOR
 
 from PyQt5 import QtWidgets, uic, QtCore
-from PyQt5.QtWidgets import QCheckBox, QListWidgetItem, QHBoxLayout, QWidget 
+from PyQt5.QtWidgets import QCheckBox, QListWidgetItem, QHBoxLayout, QWidget
 from PyQt5.QtCore import pyqtSignal
 
 from specklepy.core.api.client import SpeckleClient
 
-from specklepy_qt_ui.qt_ui.global_resources import COLOR
 
 # This loads your .ui file so that PyQt can populate your plugin with the elements from Qt Designer
 FORM_CLASS, _ = uic.loadUiType(
-    os.path.join(os.path.join(os.path.dirname(__file__), "ui", "custom_crs.ui") )
+    os.path.join(os.path.join(os.path.dirname(__file__), "ui", "custom_crs.ui"))
 )
 
-class CustomCRSDialog(QtWidgets.QWidget, FORM_CLASS):
 
+class CustomCRSDialog(QtWidgets.QWidget, FORM_CLASS):
     name_field: QtWidgets.QLineEdit = None
-    description_field: QtWidgets.QLineEdit = None
+    description: QtWidgets.QLineEdit = None
     dialog_button_box: QtWidgets.QDialogButtonBox = None
     saveSurveyPoint: QtWidgets.QPushButton = None
     speckle_client: Union[SpeckleClient, None] = None
-    dataStorage: DataStorage = None 
+    dataStorage: DataStorage = None
 
-    #Events
-    #handleCRSCreate = pyqtSignal(str,str)
+    # Events
+    # handleCRSCreate = pyqtSignal(str,str)
 
     def __init__(self, parent=None):
-        
-        super(CustomCRSDialog,self).__init__(parent, QtCore.Qt.WindowStaysOnTopHint)
+        super(CustomCRSDialog, self).__init__(parent, QtCore.Qt.WindowStaysOnTopHint)
         self.setupUi(self)
-        self.setWindowTitle("Set project center on Send/Receive")  
-        
-        #self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Close).clicked.connect(self.onCancelClicked)
-        self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Cancel).setText("More Info")
+        self.setWindowTitle("Set project center on Send/Receive")
+
+        # self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Close).clicked.connect(self.onCancelClicked)
+        self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Cancel).setText(
+            "More Info"
+        )
         self.modeDropdown.currentIndexChanged.connect(self.onModeChanged)
-    
+
     def onModeChanged(self):
         try:
-            if not self: return
+            if not self:
+                return
             index = self.modeDropdown.currentIndex()
-            if index == 1: # custom crs
+            if index == 1:  # custom crs
                 self.surveyPointLat.show()
                 self.surveyPointLon.show()
                 self.degreeSignX.show()
                 self.degreeSignY.show()
                 self.label_survey.show()
-                
+
                 self.offsetX.hide()
                 self.offsetY.hide()
                 self.label_offsets.hide()
                 self.offsetXDegreeSign.hide()
                 self.offsetYDegreeSign.hide()
-                self.description.setText("Use this option when you don't have to use a specific CRS.\
+                self.description.setText(
+                    "Use this option when you don't have to use a specific CRS.\
                                          \n\nThis will change your Project CRS to a new custom CRS.\
-                                         \n\nHint: right-click on the canvas -> Copy Coordinate -> EPSG:4326. ")
+                                         \n\nHint: right-click on the canvas -> Copy Coordinate -> EPSG:4326. "
+                )
 
-            elif index == 0: # offsets 
+            elif index == 0:  # offsets
                 self.surveyPointLat.hide()
                 self.surveyPointLon.hide()
                 self.degreeSignX.hide()
                 self.degreeSignY.hide()
                 self.label_survey.hide()
-                
+
                 self.offsetX.show()
                 self.offsetY.show()
                 self.label_offsets.show()
-                #if self.dataStorage.currentOriginalUnits == 'degrees':
+                # if self.dataStorage.currentOriginalUnits == 'degrees':
                 self.offsetXDegreeSign.show()
                 self.offsetYDegreeSign.show()
-                
+
                 units = self.dataStorage.currentOriginalUnits
-                if units == 'degrees':
+                print(units)
+                if units == "degrees":
                     self.offsetXDegreeSign.setText("°")
                     self.offsetYDegreeSign.setText("°")
                 elif units is not None:
@@ -83,49 +94,64 @@ class CustomCRSDialog(QtWidgets.QWidget, FORM_CLASS):
                 else:
                     self.offsetXDegreeSign.hide()
                     self.offsetYDegreeSign.hide()
-                
+
+                try:
+                    authid = self.dataStorage.currentCRS.authid()
+                except:
+                    try:
+                        authid = self.dataStorage.currentCRS.name
+                    except:
+                        authid = str(self.dataStorage.currentCRS)
+
                 text = f"Use this option when your project requires a use of a specific CRS. \
                         \n\nThis will only affect Speckle data properties, not your Project CRS.\
-                        \n\nHint: your current project CRS is '{self.dataStorage.currentCRS.authid()}' and using units '{self.dataStorage.currentOriginalUnits}'."
+                        \n\nHint: your current project CRS is '{authid}' and using units '{self.dataStorage.currentOriginalUnits}'."
 
-                if units == 'degrees':
+                if units == "degrees":
                     text += "\nThis CRS is not recommended if data was sent or needs to be \
                             \nreceived in a non-GIS application."
-                
+
                 self.description.setText(text)
-            
+
             self.populateSurveyPoint()
             self.populateOffsets()
             self.populateRotation()
 
         except Exception as e:
-            logToUser(e, level = 2, func = inspect.stack()[0][3])
+            logToUser(e, level=2, func=inspect.stack()[0][3])
             return
-        
+
     def populateModeDropdown(self):
-        if not self: return
+        if not self:
+            return
         try:
             self.modeDropdown.clear()
             self.modeDropdown.addItems(
-                ["Add offsets / rotation to the current Project CRS", "Create custom CRS"]
+                [
+                    "Add offsets / rotation to the current Project CRS",
+                    "Create custom CRS",
+                ]
             )
         except Exception as e:
-            logToUser(e, level = 2, func = inspect.stack()[0][3], plugin=self)
+            logToUser(e, level=2, func=inspect.stack()[0][3], plugin=self)
             return
-        
+
     def populateSurveyPoint(self):
         if not self:
             return
         try:
             self.surveyPointLat.clear()
             self.surveyPointLon.clear()
-            if self.dataStorage.custom_lat is not None and self.dataStorage.custom_lon is not None:
+            if (
+                self.dataStorage.custom_lat is not None
+                and self.dataStorage.custom_lon is not None
+            ):
                 self.surveyPointLat.setText(str(self.dataStorage.custom_lat))
                 self.surveyPointLon.setText(str(self.dataStorage.custom_lon))
         except Exception as e:
-            logToUser(e, level = 2, func = inspect.stack()[0][3], plugin=self)
+            logToUser(e, level=2, func=inspect.stack()[0][3], plugin=self)
             return
-    
+
     def populateRotation(self):
         if not self:
             return
@@ -134,19 +160,22 @@ class CustomCRSDialog(QtWidgets.QWidget, FORM_CLASS):
             if self.dataStorage.crs_rotation is not None:
                 self.rotation.setText(str(self.dataStorage.crs_rotation))
         except Exception as e:
-            logToUser(e, level = 2, func = inspect.stack()[0][3], plugin=self)
+            logToUser(e, level=2, func=inspect.stack()[0][3], plugin=self)
             return
 
     def populateOffsets(self):
         try:
             self.offsetX.clear()
             self.offsetY.clear()
-            if self.dataStorage.crs_offset_x is not None and self.dataStorage.crs_offset_y is not None:
+            if (
+                self.dataStorage.crs_offset_x is not None
+                and self.dataStorage.crs_offset_y is not None
+            ):
                 self.offsetX.setText(str(self.dataStorage.crs_offset_x))
                 self.offsetY.setText(str(self.dataStorage.crs_offset_y))
-            
+
         except Exception as e:
-            logToUser(e, level = 2, func = inspect.stack()[0][3], plugin=self)
+            logToUser(e, level=2, func=inspect.stack()[0][3], plugin=self)
             return
 
     def onOkClicked(self):
@@ -154,5 +183,5 @@ class CustomCRSDialog(QtWidgets.QWidget, FORM_CLASS):
         try:
             self.close()
         except Exception as e:
-            logToUser(e, level = 2, func = inspect.stack()[0][3])
+            logToUser(e, level=2, func=inspect.stack()[0][3])
             return

qt_ui/widget_dependencies_upgrade.py

@@ -3,7 +3,11 @@ import urllib3
 import requests
 import requests_toolbelt
 from specklepy.logging import metrics
-from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
+
+try:
+    from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
+except ModuleNotFoundError:
+    from speckle.specklepy_qt_ui.qt_ui.DataStorage import DataStorage
 
 from PyQt5 import QtWidgets, uic, QtCore
 
@@ -87,7 +91,11 @@ To do it manually, you can run 2 following commands from QGIS Plugins panel->Pyt
 
     def runSubprocess(self):
         import subprocess
-        from speckle.utils.utils import get_qgis_python_path as path
+
+        try:
+            from speckle.utils.utils import get_qgis_python_path as path
+        except ModuleNotFoundError:
+            from speckle.speckle.utils.utils import get_qgis_python_path as path
 
         result1 = subprocess.run(
             [path(), "-m", "pip", "install", "requests==2.31.0"],

qt_ui/widget_report.py

@@ -1,70 +1,83 @@
 import inspect
 import os
 from typing import List, Tuple, Union
-from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
-#from specklepy_qt_ui.qt_ui.logger import logToUser
+
+try:
+    from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
+    from specklepy_qt_ui.qt_ui.utils.global_resources import COLOR
+    from specklepy_qt_ui.qt_ui.utils.utils import SYMBOL
+except ModuleNotFoundError:
+    from speckle.specklepy_qt_ui.qt_ui.DataStorage import DataStorage
+    from speckle.specklepy_qt_ui.qt_ui.utils.global_resources import COLOR
+    from speckle.specklepy_qt_ui.qt_ui.utils.utils import SYMBOL
+
+# from specklepy_qt_ui.qt_ui.utils.logger import logToUser
 
 from PyQt5 import QtWidgets, uic, QtCore
-from PyQt5.QtWidgets import QCheckBox, QListWidgetItem, QHBoxLayout, QWidget 
+from PyQt5.QtWidgets import QCheckBox, QListWidgetItem, QHBoxLayout, QWidget
 from PyQt5.QtCore import pyqtSignal
 
 from specklepy.core.api.client import SpeckleClient
 
-from specklepy_qt_ui.qt_ui.global_resources import COLOR
 
 # This loads your .ui file so that PyQt can populate your plugin with the elements from Qt Designer
 FORM_CLASS, _ = uic.loadUiType(
-    os.path.join(os.path.join(os.path.dirname(__file__), "ui", "report.ui") )
+    os.path.join(os.path.join(os.path.dirname(__file__), "ui", "report.ui"))
 )
 
-class ReportDialog(QtWidgets.QWidget, FORM_CLASS):
 
+class ReportDialog(QtWidgets.QWidget, FORM_CLASS):
     report_label: QtWidgets.QLabel = None
     report_text: QtWidgets.QTextEdit = None
     dataStorage: DataStorage = None
 
     def __init__(self, parent=None):
-        
-        super(ReportDialog,self).__init__(parent, QtCore.Qt.WindowStaysOnTopHint)
+        super(ReportDialog, self).__init__(parent, QtCore.Qt.WindowStaysOnTopHint)
         self.setupUi(self)
         self.runAllSetup()
-    
+
     def runAllSetup(self):
-        self.setWindowTitle("Report (Speckle)")  
+        self.setWindowTitle("Report (Speckle)")
         self.setMinimumWidth(500)
         self.setMinimumHeight(600)
         self.report_label.setWordWrap(True)
-        self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Ok).clicked.connect(self.onOkClicked)
+        self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Ok).clicked.connect(
+            self.onOkClicked
+        )
 
         return
-        #self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Cancel).setText("More Info")
-    
+        # self.dialog_button_box.button(QtWidgets.QDialogButtonBox.Cancel).setText("More Info")
+
     def assembleReport(self):
         try:
-            if self.dataStorage is None: return 
-            reportList = self.dataStorage.latestActionReport
-            if reportList is None: return
+            if self.dataStorage is None:
+                return
+            reportList: List[dict] = self.dataStorage.latestActionReport
+            if reportList is None:
+                return
 
             operation = ""
             total_layers = 0
             total_objects = 0
             text = ""
             sending = True
-            
-            # details 
+
+            # details
             last_report = ""
             last_report += "Details:" + "\n"
             for item in reportList:
                 line = "✅ "
-                try: # if sending
-                    line += f'{item["feature_id"]}: {item["obj_type"]}'
+                try:  # if sending
+                    some_id = item["feature_id"].replace(SYMBOL, "\\")
+                    line += f'{some_id}: {item["obj_type"]}'
                     operation = f"Sent at {self.dataStorage.latestActionTime}"
-                except: # if receiving
+                except:  # if receiving
                     sending = False
-                    line += f'{item["speckle_id"]}: {item["obj_type"]}'
+                    some_id = item[list(item.keys())[0]].replace(SYMBOL, "\\")
+                    line += f'{some_id}: {item["obj_type"]}'  # f'{item["speckle_id"]}: {item["obj_type"]}'
                     operation = f"Received at {self.dataStorage.latestActionTime}"
-                
-                # edit based on the type 
+
+                # edit based on the type
                 if "Layer" in item["obj_type"]:
                     total_layers += 1
                     if item["errors"] != "":
@@ -75,61 +88,84 @@ class ReportDialog(QtWidgets.QWidget, FORM_CLASS):
                     if item["errors"] != "":
                         line += f', errors: {item["errors"]}'
                         line = "❌ " + line[1:]
-                    else: total_objects += 1
+                    else:
+                        total_objects += 1
                     line = "__ " + line
 
                 last_report += line + "\n"
 
             text += f"Operation: {operation}\n"
             text += f"Total: {total_layers} layer{'' if str(total_layers).endswith('1') else 's'}, {total_objects} feature{'' if str(total_objects).endswith('1') else 's'}\n\n"
-            if sending is False: 
+            if sending is False:
                 try:
                     text += f"Host application: {self.dataStorage.latestHostApp}\n\n"
-                except: pass 
+                except:
+                    pass
 
             # layers and transformations (if applicable)
             text += "Layers and transformations (if applicable):" + "\n"
             for i, layer in enumerate(self.dataStorage.latestActionLayers):
-                #print(self.dataStorage.latestActionLayers)
-                name = layer #if isinstance(layer, str) else layer.name()
-                try: 
+                # print(self.dataStorage.latestActionLayers)
+                name = layer  # if isinstance(layer, str) else layer.name()
+                try:
                     transformExists = 0
                     for item in self.dataStorage.savedTransforms:
-                        layer_name = item.split("  ->  ")[0].split(" (\'")[0]
+                        layer_name = item.split("  ->  ")[0].split(" ('")[0]
                         transform_name = item.split("  ->  ")[1]
                         if layer_name == name:
-                            text += f"{i+1}. {layer_name}  ->  '{transform_name}'" + "\n"
+                            text += (
+                                f"{i+1}. {layer_name}  ->  '{transform_name}'" + "\n"
+                            )
                             transformExists += 1
-                            break 
-                    if transformExists==0:
+                            break
+                    if transformExists == 0:
                         text += f"{i+1}. {name} \n"
-                except Exception as e: print(e)
-            text +=  "\n"
+                except Exception as e:
+                    print(e)
+            text += "\n"
 
             # add info about the offsets
-            text += "Project CRS: " + self.dataStorage.project.crs().authid() + "\n"
+            try:
+                crs = self.dataStorage.project.crs()
+                text += "Project CRS: " + crs.authid() + "\n"
+                crs_keyword = "CRS"
+            except AttributeError:
+                crs = self.dataStorage.project.activeMap.spatialReference
+                crs_keyword = "Spatial Reference"
+                text += f"Project {crs_keyword}: " + crs.name + "\n"
             units = self.dataStorage.latestActionUnits
-            text += "Project CRS units: " + units + f"{' (not supported, treated as Meters)' if 'degrees' in units else ''}" + "\n"
-            text += "Project CRS WKT: \n" + self.dataStorage.project.crs().toWkt() + "\n\n"
-            text += f"CRS offsets: x={self.dataStorage.crs_offset_x}, y={self.dataStorage.crs_offset_y}" + "\n"
-            text += f"CRS rotation: {self.dataStorage.crs_rotation}°" + "\n\n" 
+            text += (
+                f"Project {crs_keyword} units: "
+                + units
+                + f"{' (not supported, treated as Meters)' if 'degrees' in units else ''}"
+                + "\n"
+            )
+            try:
+                text += f"Project {crs_keyword} WKT: \n" + crs.toWkt() + "\n\n"
+            except:
+                text += f"Project {crs_keyword} WKT: \n" + crs.exportToString() + "\n\n"
+
+            text += (
+                f"{crs_keyword} offsets: x={self.dataStorage.crs_offset_x}, y={self.dataStorage.crs_offset_y}"
+                + "\n"
+            )
+            text += f"{crs_keyword} rotation: {self.dataStorage.crs_rotation}°" + "\n\n"
 
             text += last_report
 
-            return operation, total_layers, total_objects, text 
+            return operation, total_layers, total_objects, text
         except Exception as e:
             print(e)
-            return 
+            return
 
-    def applyReport(self): 
+    def applyReport(self):
         result = self.assembleReport()
         if result is None:
             print("no report generated")
-            return 
+            return
         operation, total_layers, total_objects, report = result
-        #self.report_label.setText(f"Operation: {operation}\nTotal: {total_layers} layer{'' if str(total_layers).endswith('1') else 's'}, {total_objects} feature{'' if str(total_objects).endswith('1') else 's'}")
+        # self.report_label.setText(f"Operation: {operation}\nTotal: {total_layers} layer{'' if str(total_layers).endswith('1') else 's'}, {total_objects} feature{'' if str(total_objects).endswith('1') else 's'}")
         self.report_text.setText(report)
-    
+
     def onOkClicked(self):
         self.close()
-    

qt_ui/widget_transforms.py

@@ -1,6 +1,10 @@
 
 import os
-from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
+
+try:
+    from specklepy_qt_ui.qt_ui.DataStorage import DataStorage
+except ModuleNotFoundError: 
+    from speckle.specklepy_qt_ui.qt_ui.DataStorage import DataStorage
 
 from PyQt5 import QtWidgets, uic, QtCore