Update shotgrid publish plugins

Ellipsanime · Feb 7, 2022 · d11b089 · d11b089
1 parent 7ab8c50
commit d11b089
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/openpype/modules/default_modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/default_modules/deadline/plugins/publish/submit_publish_job.py
@@ -111,6 +111,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
  "celaction": [r".*"]}
 
  enviro_filter = [
+ "OPENPYPE_SG_USER",
  "FTRACK_API_USER",
  "FTRACK_API_KEY",
  "FTRACK_SERVER",

diff --git a/openpype/modules/default_modules/shotgrid/plugins/publish/integrate_shotgrid_publish.py b/openpype/modules/default_modules/shotgrid/plugins/publish/integrate_shotgrid_publish.py
@@ -18,7 +18,7 @@ def process(self, instance):
 
  version_id = context.data.get("versionEntity", {}).get("_id")
 
- shotgrid_version = context.data.get("shotgridVersion")
+ shotgrid_version = instance.data.get("shotgridVersion")
 
  for representation in instance.data.get("representations", []):
 

diff --git a/openpype/modules/default_modules/shotgrid/plugins/publish/integrate_shotgrid_version.py b/openpype/modules/default_modules/shotgrid/plugins/publish/integrate_shotgrid_version.py
@@ -2,19 +2,30 @@
 import pyblish.api
 
 
-class IntegrateShotgridVersion(pyblish.api.ContextPlugin):
+class IntegrateShotgridVersion(pyblish.api.InstancePlugin):
  """ Integrate Shotgrid Version """
 
  order = pyblish.api.IntegratorOrder+0.497
  label = "Shotgrid Version"
 
  sg = None
 
- def process(self, context):
+ def process(self, instance):
 
+ context = instance.context
  self.sg = context.data.get("shotgridSession")
 
- code = os.path.splitext(os.path.basename(context.data.get("currentFile")))[0]
+ # TODO: Use path template solver to build version code from settings
+ anatomy = instance.data.get("anatomyData", {})
+ code = "_".join(
+ [
+ anatomy['project']['code'],
+ anatomy['parent'],
+ anatomy['asset'],
+ anatomy['task']['name'],
+ "v{:03}".format(int(anatomy['version']))
+ ]
+ )
 
  version = self._find_existing_version(code, context)
 
@@ -23,8 +34,9 @@ def process(self, context):
  self.log.info("Create Shotgrid version: {}".format(version))
  else:
  self.log.info("Use existing Shotgrid version: {}".format(version))
+ self.sg.update("Version", version['id'], _additional_version_data(context))
 
- context.data["shotgridVersion"] = version
+ instance.data["shotgridVersion"] = version
 
  def _find_existing_version(self, code, context):