From fe8711cf7804336593de7d0ac1ff94ec6e1b3b13 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 16 Nov 2023 15:42:44 +0100
Subject: [PATCH] Publisher: Bugfixes and enhancements (#5924)

* fix logger getter

* catch crashes of create plugin initializations

* use 'product' instead of 'subset' in AYON mode

* fix import
---
 openpype/tools/publisher/control.py           | 19 ++++++++++++++-----
 .../publisher/widgets/overview_widget.py      |  7 ++++++-
 openpype/tools/publisher/widgets/widgets.py   | 10 ++++++++--
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/openpype/tools/publisher/control.py b/openpype/tools/publisher/control.py
index a6264303d5..3192fe949f 100644
--- a/openpype/tools/publisher/control.py
+++ b/openpype/tools/publisher/control.py
@@ -1453,7 +1453,7 @@ class BasePublisherController(AbstractPublisherController):
         """
 
         if self._log is None:
-            self._log = logging.getLogget(self.__class__.__name__)
+            self._log = logging.getLogger(self.__class__.__name__)
         return self._log
 
     @property
@@ -1881,10 +1881,19 @@ class PublisherController(BasePublisherController):
         self._emit_event("plugins.refresh.finished")
 
     def _collect_creator_items(self):
-        return {
-            identifier: CreatorItem.from_creator(creator)
-            for identifier, creator in self._create_context.creators.items()
-        }
+        # TODO add crashed initialization of create plugins to report
+        output = {}
+        for identifier, creator in self._create_context.creators.items():
+            try:
+                output[identifier] = CreatorItem.from_creator(creator)
+            except Exception:
+                self.log.error(
+                    "Failed to create creator item for '%s'",
+                    identifier,
+                    exc_info=True
+                )
+
+        return output
 
     def _reset_instances(self):
         """Reset create instances."""
diff --git a/openpype/tools/publisher/widgets/overview_widget.py b/openpype/tools/publisher/widgets/overview_widget.py
index 778aa1139f..10151250f6 100644
--- a/openpype/tools/publisher/widgets/overview_widget.py
+++ b/openpype/tools/publisher/widgets/overview_widget.py
@@ -1,5 +1,7 @@
 from qtpy import QtWidgets, QtCore
 
+from openpype import AYON_SERVER_ENABLED
+
 from .border_label_widget import BorderedLabelWidget
 
 from .card_view_widgets import InstanceCardView
@@ -35,7 +37,10 @@ class OverviewWidget(QtWidgets.QFrame):
         # --- Created Subsets/Instances ---
         # Common widget for creation and overview
         subset_views_widget = BorderedLabelWidget(
-            "Subsets to publish", subset_content_widget
+            "{} to publish".format(
+                "Products" if AYON_SERVER_ENABLED else "Subsets"
+            ),
+            subset_content_widget
         )
 
         subset_view_cards = InstanceCardView(controller, subset_views_widget)
diff --git a/openpype/tools/publisher/widgets/widgets.py b/openpype/tools/publisher/widgets/widgets.py
index 6dbeaad821..1860287fcf 100644
--- a/openpype/tools/publisher/widgets/widgets.py
+++ b/openpype/tools/publisher/widgets/widgets.py
@@ -210,7 +210,9 @@ class CreateBtn(PublishIconBtn):
     def __init__(self, parent=None):
         icon_path = get_icon_path("create")
         super(CreateBtn, self).__init__(icon_path, "Create", parent)
-        self.setToolTip("Create new subset/s")
+        self.setToolTip("Create new {}/s".format(
+            "product" if AYON_SERVER_ENABLED else "subset"
+        ))
         self.setLayoutDirection(QtCore.Qt.RightToLeft)
 
 
@@ -655,7 +657,11 @@ class TasksCombobox(QtWidgets.QComboBox):
         self._proxy_model.set_filter_empty(invalid)
         if invalid:
             self._set_is_valid(False)
-            self.set_text("< One or more subsets require Task selected >")
+            self.set_text(
+                "< One or more {} require Task selected >".format(
+                    "products" if AYON_SERVER_ENABLED else "subsets"
+                )
+            )
         else:
             self.set_text(None)