Merge pull request #549 from ynput/feature/AY-4921_Move-TrayPublisher-client-code

TrayPublisher: Move client code

client/ayon_core/addon/base.py

@@ -52,6 +52,7 @@ IGNORED_MODULES_IN_AYON = set()
 MOVED_ADDON_MILESTONE_VERSIONS = {
     "applications": VersionInfo(0, 2, 0),
     "clockify": VersionInfo(0, 2, 0),
+    "traypublisher": VersionInfo(0, 2, 0),
     "tvpaint": VersionInfo(0, 2, 0),
 }
 

server_addon/traypublisher/client/ayon_traypublisher/addon.py

@@ -29,8 +29,8 @@ class TrayPublishAddon(AYONAddon, IHostAddon, ITrayAction):
     def on_action_trigger(self):
         self.run_traypublisher()
 
-    def connect_with_addons(self, enabled_modules):
+    def connect_with_addons(self, enabled_addons):
-        """Collect publish paths from other modules."""
+        """Collect publish paths from other addons."""
         publish_paths = self.manager.collect_plugin_paths()["publish"]
         self.publish_paths.extend(publish_paths)
 
@@ -55,9 +55,9 @@ def cli_main():
 def launch():
     """Launch TrayPublish tool UI."""
 
-    from ayon_core.tools import traypublisher
+    from ayon_traypublisher import ui
 
-    traypublisher.main()
+    ui.main()
 
 
 @cli_main.command()

server_addon/traypublisher/client/ayon_traypublisher/api/plugin.py

@@ -22,7 +22,7 @@ from .pipeline import (
 )
 
 REVIEW_EXTENSIONS = set(IMAGE_EXTENSIONS) | set(VIDEO_EXTENSIONS)
-SHARED_DATA_KEY = "openpype.traypublisher.instances"
+SHARED_DATA_KEY = "ayon.traypublisher.instances"
 
 
 class HiddenTrayPublishCreator(HiddenCreator):

server_addon/traypublisher/client/ayon_traypublisher/csv_publish.py

@@ -6,7 +6,7 @@ from ayon_core.lib.attribute_definitions import FileDefItem
 from ayon_core.pipeline import install_host
 from ayon_core.pipeline.create import CreateContext
 
-from ayon_core.hosts.traypublisher.api import TrayPublisherHost
+from ayon_traypublisher.api import TrayPublisherHost
 
 
 def csvpublish(

server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_colorspace_look.py

@@ -15,13 +15,13 @@ from ayon_core.pipeline import (
     CreatorError
 )
 from ayon_core.pipeline import colorspace
-from ayon_core.hosts.traypublisher.api.plugin import TrayPublishCreator
+from ayon_traypublisher.api.plugin import TrayPublishCreator
 
 
 class CreateColorspaceLook(TrayPublishCreator):
     """Creates colorspace look files."""
 
-    identifier = "io.openpype.creators.traypublisher.colorspace_look"
+    identifier = "io.ayon.creators.traypublisher.colorspace_look"
     label = "Colorspace Look"
     product_type = "ociolook"
     description = "Publishes color space look file."

server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_csv_ingest.py

@@ -13,9 +13,7 @@ from ayon_core.lib.transcoding import (
     VIDEO_EXTENSIONS, IMAGE_EXTENSIONS
 )
 from ayon_core.pipeline.create import CreatorError
-from ayon_core.hosts.traypublisher.api.plugin import (
+from ayon_traypublisher.api.plugin import TrayPublishCreator
-    TrayPublishCreator
-)
 
 
 class IngestCSV(TrayPublishCreator):

server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_editorial.py

@@ -4,11 +4,11 @@ from copy import deepcopy
 import ayon_api
 import opentimelineio as otio
 
-from ayon_core.hosts.traypublisher.api.plugin import (
+from ayon_traypublisher.api.plugin import (
     TrayPublishCreator,
     HiddenTrayPublishCreator
 )
-from ayon_core.hosts.traypublisher.api.editorial import (
+from ayon_traypublisher.api.editorial import (
     ShotMetadataSolver
 )
 from ayon_core.pipeline import CreatedInstance

server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_editorial_package.py

@@ -9,7 +9,7 @@ from ayon_core.lib.attribute_definitions import (
     BoolDef,
     TextDef,
 )
-from ayon_core.hosts.traypublisher.api.plugin import TrayPublishCreator
+from ayon_traypublisher.api.plugin import TrayPublishCreator
 
 
 class EditorialPackageCreator(TrayPublishCreator):

server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_from_settings.py

@@ -6,7 +6,7 @@ log = Logger.get_logger(__name__)
 
 
 def initialize():
-    from ayon_core.hosts.traypublisher.api.plugin import SettingsCreator
+    from ayon_traypublisher.api.plugin import SettingsCreator
 
     project_name = os.environ["AYON_PROJECT_NAME"]
     project_settings = get_project_settings(project_name)

server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_movie_batch.py

@@ -17,8 +17,8 @@ from ayon_core.pipeline.create import (
     TaskNotSetError,
 )
 
-from ayon_core.hosts.traypublisher.api.plugin import TrayPublishCreator
+from ayon_traypublisher.api.plugin import TrayPublishCreator
-from ayon_core.hosts.traypublisher.batch_parsing import (
+from ayon_traypublisher.batch_parsing import (
     get_folder_entity_from_filename
 )
 

server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_online.py

@@ -14,13 +14,13 @@ from ayon_core.pipeline import (
     CreatedInstance,
     CreatorError
 )
-from ayon_core.hosts.traypublisher.api.plugin import TrayPublishCreator
+from ayon_traypublisher.api.plugin import TrayPublishCreator
 
 
 class OnlineCreator(TrayPublishCreator):
     """Creates instance from file and retains its original name."""
 
-    identifier = "io.openpype.creators.traypublisher.online"
+    identifier = "io.ayon.creators.traypublisher.online"
     label = "Online"
     product_type = "online"
     description = "Publish file retaining its original file name"

server_addon/traypublisher/client/ayon_traypublisher/ui/window.py

@@ -13,7 +13,6 @@ import qtawesome
 
 from ayon_core.lib import AYONSettingsRegistry, is_running_from_build
 from ayon_core.pipeline import install_host
-from ayon_core.hosts.traypublisher.api import TrayPublisherHost
 from ayon_core.tools.publisher.control_qt import QtPublisherController
 from ayon_core.tools.publisher.window import PublisherWindow
 from ayon_core.tools.common_models import ProjectsModel
@@ -24,6 +23,7 @@ from ayon_core.tools.utils import (
     ProjectSortFilterProxy,
     PROJECT_NAME_ROLE,
 )
+from ayon_traypublisher.api import TrayPublisherHost
 
 
 class TrayPublisherRegistry(AYONSettingsRegistry):

server_addon/traypublisher/package.py

@@ -1,3 +1,10 @@
 name = "traypublisher"
 title = "TrayPublisher"
-version = "0.1.5"
+version = "0.2.0"
+
+client_dir = "ayon_traypublisher"
+
+ayon_required_addons = {
+    "core": ">0.3.2",
+}
+ayon_compatible_addons = {}