Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Feature/webpublisher backend #1876

Merged
merged 67 commits into from
Aug 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
e4c4e10
Webpublisher backend - added new command for webserver
kalisp Jul 22, 2021
e4cc303
Webpublisher backend - implemented context endopoint
kalisp Jul 25, 2021
6c32a8e
Webpublisher backend - changed uri to api
kalisp Jul 26, 2021
622ff2a
Webpublisher backend - changed uri to api
kalisp Jul 26, 2021
32a82b5
Webpublisher - backend - added webpublisher host
kalisp Jul 27, 2021
ca1ad20
Webpublisher - backend - added task_finish endpoint
kalisp Jul 27, 2021
52c6bdc
Webpublisher - backend - skip version collect for webpublisher
kalisp Jul 28, 2021
f104d60
Webpublisher - backend - updated command
kalisp Jul 28, 2021
a43837c
Webpublisher - backend - added collector plugin
kalisp Jul 28, 2021
824714c
Webpublisher - backend - added endpoints for reporting
kalisp Jul 28, 2021
bfd2ad6
Webpublisher - backend - hound
kalisp Jul 28, 2021
7decf0a
Webpublisher - backend - added settings and defaults
kalisp Jul 29, 2021
4f63e3d
Webpublisher - backend - updated settings
kalisp Jul 29, 2021
dea843d
Webpublisher - backend - implemented version and subset name
kalisp Jul 29, 2021
3c7f6a8
Webpublisher - backend - refactored routes
kalisp Jul 30, 2021
349ddf6
Webpublisher - backend - fix signature
kalisp Jul 30, 2021
f12df9a
Webpublisher - backend - fix entityType as optional
kalisp Jul 30, 2021
61be1cb
Webpublisher - backend - fix app name
kalisp Jul 30, 2021
59ff922
Webpublisher - backend - set to session for Ftrack family collector
kalisp Jul 30, 2021
b0101c4
Merge branch 'develop' of github.com:pypeclub/pype into feature/webpu…
kalisp Jul 30, 2021
b921867
Merge branch 'develop' of github.com:pypeclub/pype into feature/webpu…
kalisp Aug 2, 2021
276482e
Webpublisher - backend - fixes for single file publish
kalisp Aug 2, 2021
63a0c66
Webpublisher - backend - fix - removed shell flag causing problems on…
kalisp Aug 2, 2021
40f44ed
Webpublisher - backend - fix - wrong key in DB
kalisp Aug 3, 2021
35f35e9
Merge branch 'develop' of github.com:pypeclub/pype into feature/webpu…
kalisp Aug 5, 2021
8c5941d
Webpublisher - added webpublisher host to extract burnin and review
kalisp Aug 6, 2021
64834df
Fix - Deadline publish on Linux started Tray instead of headless publ…
kalisp Aug 12, 2021
96021da
creating thumbnails from exr in webpublisher
jakubjezek001 Aug 18, 2021
9c56eb3
Webpublisher - added translation from email to username
kalisp Aug 18, 2021
3d0b470
Webpublisher - added collector for fps
kalisp Aug 18, 2021
45fbdcb
Webpublisher - added storing full log to Mongo
kalisp Aug 18, 2021
f459791
Webpublisher - added reprocess functionality
kalisp Aug 18, 2021
d2a34a6
Webpublisher - added reprocess functionality
kalisp Aug 19, 2021
932ae5f
Hound
kalisp Aug 19, 2021
c6dad89
Webpublisher - added configurable tags + defaults
kalisp Aug 19, 2021
4a09a18
Webpublisher - fix - status wasn't changed for reprocessed batches
kalisp Aug 19, 2021
34fef4e
Merge
kalisp Aug 19, 2021
080069c
Webpublisher - added review to enum, changed defaults
kalisp Aug 20, 2021
92ef094
Webpublisher - added path field to log documents
kalisp Aug 20, 2021
10fa591
Webpublisher - added documentation
kalisp Aug 23, 2021
eabfc47
Hound
kalisp Aug 23, 2021
a3f1067
Webpublisher - webserver ip is configurable
kalisp Aug 24, 2021
47f529b
Webpublisher - rename to last version
kalisp Aug 25, 2021
5164481
Webpublisher - introduced FTRACK_BOT_API_USER
kalisp Aug 25, 2021
bcea6fb
Webpublisher - removed is_webpublish_enabled as unneeded
kalisp Aug 25, 2021
9a9acc1
Webpublisher - introduced command line arguments for host and port
kalisp Aug 25, 2021
d5cc025
Merge
kalisp Aug 25, 2021
91f9362
Webpublisher - proper merge
kalisp Aug 25, 2021
f7cb778
Webpublisher - proper merge
kalisp Aug 25, 2021
b235068
Webpublisher - proper merge
kalisp Aug 25, 2021
e666fad
Webpublisher - updated help label
kalisp Aug 25, 2021
1387b75
Webpublisher - revert mixed up commit
kalisp Aug 25, 2021
3dfe351
Webpublisher - fixed host install
kalisp Aug 25, 2021
c7c45ec
Webpublisher - removed unwanted folder
kalisp Aug 25, 2021
f4e0b52
Merge
kalisp Aug 25, 2021
a65f0e1
fixed webserver module
iLLiCiTiT Aug 25, 2021
994c4d1
Merge branch 'develop' of github.com:pypeclub/pype into feature/webpu…
kalisp Aug 25, 2021
5dbc7ab
recommit changes
iLLiCiTiT Aug 25, 2021
455b4c6
Merge branch 'develop' of github.com:pypeclub/pype into feature/webpu…
kalisp Aug 25, 2021
69af278
Merge remote-tracking branch 'origin/feature/webpublisher_backend' in…
kalisp Aug 25, 2021
cd56592
use host port from kwargs
iLLiCiTiT Aug 25, 2021
66b7101
Webpublisher - fix propagation of host
kalisp Aug 25, 2021
64ab6ff
Webpublisher - better port and host handling
kalisp Aug 25, 2021
2d55233
Hound
kalisp Aug 25, 2021
430801d
Webpublisher - move plugin to Ftrack
kalisp Aug 25, 2021
8c9f20b
Webpublisher - moved dummy ls to api
kalisp Aug 25, 2021
cb229e9
Merge back to develop
kalisp Aug 25, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions openpype/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,31 @@ def eventserver(debug,
)


@main.command()
@click.option("-d", "--debug", is_flag=True, help="Print debug messages")
@click.option("-h", "--host", help="Host", default=None)
@click.option("-p", "--port", help="Port", default=None)
@click.option("-e", "--executable", help="Executable")
@click.option("-u", "--upload_dir", help="Upload dir")
kalisp marked this conversation as resolved.
Show resolved Hide resolved
def webpublisherwebserver(debug, executable, upload_dir, host=None, port=None):
"""Starts webserver for communication with Webpublish FR via command line

OP must be congigured on a machine, eg. OPENPYPE_MONGO filled AND
FTRACK_BOT_API_KEY provided with api key from Ftrack.

Expect "pype.club" user created on Ftrack.
"""
if debug:
os.environ['OPENPYPE_DEBUG'] = "3"

PypeCommands().launch_webpublisher_webservercli(
upload_dir=upload_dir,
executable=executable,
host=host,
port=port
)


@main.command()
@click.argument("output_json_path")
@click.option("--project", help="Project name", default=None)
Expand Down Expand Up @@ -131,6 +156,25 @@ def publish(debug, paths, targets):
PypeCommands.publish(list(paths), targets)


@main.command()
@click.argument("path")
@click.option("-d", "--debug", is_flag=True, help="Print debug messages")
@click.option("-h", "--host", help="Host")
@click.option("-u", "--user", help="User email address")
@click.option("-p", "--project", help="Project")
@click.option("-t", "--targets", help="Targets", default=None,
multiple=True)
def remotepublish(debug, project, path, host, targets=None, user=None):
"""Start CLI publishing.

Publish collects json from paths provided as an argument.
More than one path is allowed.
"""
if debug:
os.environ['OPENPYPE_DEBUG'] = '3'
PypeCommands.remotepublish(project, path, host, user, targets=targets)


@main.command()
@click.option("-d", "--debug", is_flag=True, help="Print debug messages")
@click.option("-p", "--project", required=True,
Expand Down
6 changes: 6 additions & 0 deletions openpype/hosts/webpublisher/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Webpublisher
-------------

Plugins meant for processing of Webpublisher.

Gets triggered by calling openpype.cli.remotepublish with appropriate arguments.
Empty file.
43 changes: 43 additions & 0 deletions openpype/hosts/webpublisher/api/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import os
import logging

from avalon import api as avalon
from avalon import io
from pyblish import api as pyblish
import openpype.hosts.webpublisher

log = logging.getLogger("openpype.hosts.webpublisher")

HOST_DIR = os.path.dirname(os.path.abspath(
openpype.hosts.webpublisher.__file__))
PLUGINS_DIR = os.path.join(HOST_DIR, "plugins")
PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish")
LOAD_PATH = os.path.join(PLUGINS_DIR, "load")
CREATE_PATH = os.path.join(PLUGINS_DIR, "create")


def application_launch():
pass


def install():
print("Installing Pype config...")

pyblish.register_plugin_path(PUBLISH_PATH)
avalon.register_plugin_path(avalon.Loader, LOAD_PATH)
avalon.register_plugin_path(avalon.Creator, CREATE_PATH)
log.info(PUBLISH_PATH)

io.install()
avalon.on("application.launched", application_launch)


def uninstall():
pyblish.deregister_plugin_path(PUBLISH_PATH)
avalon.deregister_plugin_path(avalon.Loader, LOAD_PATH)
avalon.deregister_plugin_path(avalon.Creator, CREATE_PATH)


# to have required methods for interface
def ls():
pass
28 changes: 28 additions & 0 deletions openpype/hosts/webpublisher/plugins/publish/collect_fps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
"""
Requires:
Nothing

Provides:
Instance
"""

import pyblish.api
from pprint import pformat


class CollectFPS(pyblish.api.InstancePlugin):
"""
Adds fps from context to instance because of ExtractReview
"""

label = "Collect fps"
order = pyblish.api.CollectorOrder + 0.49
hosts = ["webpublisher"]

def process(self, instance):
fps = instance.context.data["fps"]

instance.data.update({
"fps": fps
})
self.log.debug(f"instance.data: {pformat(instance.data)}")
Loading