mirror of
https://github.com/ynput/ayon-core.git
synced 2025-12-25 05:14:40 +01:00
* General: Connect to AYON server (base) (#3924) * implemented 'get_workfile_info' in entities * removed 'prepare_asset_update_data' which is not used * disable settings and project manager if in v4 mode * prepared conversion helper functions for v4 entities * prepared conversion functions for hero versions * fix hero versions * implemented get_archived_representations * fix get latest versions * return prepared changes * handle archived representation * raise exception on failed json conversion * map archived to active properly * make sure default fields are added * fix conversion of hero version entity * fix conversion of archived representations * fix some conversions of representations and versions * changed active behavior in queries * fixed hero versions * implemented basic thumbnail caching * added raw variants of crud methods * implemented methods to get and create thumbnail * fix from flat dict * implemented some basic folder conversion for updates * fix thumbnail updates for version * implemented v4 thumbnail integrator * simplified data mapping * 'get_thumbnail' function also expect entity type and entity id for which is the thumbnail received * implemented 'get_thumbnail' for server * fix how thumbnail id is received from entity * removed unnecessary method 'get_thumbnail_id_from_source' * implemented thumbnail resolver for v4 * removed unnecessary print * move create and delete project directly to server api * disable local settings action too on v4 * OP-3521 - added method to check and download updated addons from v4 server * OP-3521 - added more descriptive error message for missing source * OP-3521 - added default implementation of addon downloader to import * OP-3521 - added check for dependency package zips WIP - server doesn't contain required endpoint. Testing only with mockup data for now. * OP-3521 - fixed parsing of DependencyItem Added Server Url type and ServerAddonDownloader - v4 server doesn't know its own DNS for static files so it is sending unique name and url must be created during runtime. * OP-3521 - fixed creation of targed directories * change nev keys to look for and don't set them automatically * fix task type conversion * implemented base of loading v4 addons in v3 * Refactored argument name in Downloaders * Updated parsing to DependencyItem according to current schema * Implemented downloading of package from server * Updated resolving of failures Uses Enum items. * Introduced passing of authorization token Better to inject it than to have it from env var. * Remove weird parsing of server_url Not necessary, endpoints have same prefix. * Fix doubling asset version name in addons folder Zip file should already contain `addonName_addonVersion` as first subfolder * Fix doubling asset version name in addons folder Zip file should already contain `addonName_addonVersion` as first subfolder * Made server_endpoint optional Argument should be better for testing, but for calling from separate methods it would be better to encapsulate it. Removed unwanted temporary productionPackage value * Use existing method to pull addon info from Server to load v4 version of addon * Raise exception when server doesn't have any production dependency package * added ability to specify v3 alias of addon name * expect v3_alias as uppered constant * Re-implemented method to get addon info Previous implementation wouldn't work in Python2 hosts. Will be refactored in the future. * fix '__getattr__' * added ayon api to pyproject.toml and lock file * use ayon api in common connection * added mapping for label * use ayon_api in client codebase * separated clearing cache of url and username * bump ayon api version * rename env 'OP4_TEST' to 'USE_AYON_SERVER' * Move and renamend get_addons_info to get_addons_info_as_dict in addon_distribution Should be moved to ayon_api later * Replaced requests calls with ayon_api * Replaced OP4_TEST_ENABLED with AYON_SERVER_ENABLED fixed endpoints * Hound * Hound * OP-3521 - fix wrong key in get_representation_parents parents overloads parents * OP-3521 - changes for v4 of SiteSync addon * OP-3521 - fix names * OP-3521 - remove storing project_name It should be safer to go thorug self.dbcon apparently * OP-3521 - remove unwanted "context["folder"]" can be only in dummy test data * OP-3521 - move site sync loaders to addon * Use only project instead of self.project * OP-3521 - added missed get_progress_for_repre * base of settings conversion script * simplified ayon functions in start.py * added loading of settings from ayon server * added a note about colors * fix global and local settings functions * AvalonMongoDB is not using mongo connection on ayon server enabled * 'get_dynamic_modules_dirs' is not checking system settings for paths in setting * log viewer is disabled when ayon server is enabled * basic logic of enabling/disabled addons * don't use mongo logging if ayon server is enabled * update ayon api * bump ayon api again * use ayon_api to get addons info in modules/base * update ayon api * moved helper functions to get addons and dependencies dir to common functions * Initialization of AddonInfo is not crashing on unkonwn sources * renamed 'DependencyDownloader' to 'AyonServerDownloader' * renamed function 'default_addon_downloader' to 'get_default_addon_downloader' * Added ability to convert 'WebAddonSource' to 'ServerResourceSorce' * missing dependency package on server won't cause crash * data sent to downloaders don't contain ayon specific headers * modified addon distribution to not duplicate 'ayon_api' functionality * fix doubled function defintioin * unzip client file to addon destination * formatting - unify quotes * disable usage of mongo connection if in ayon mode * renamed window.py to login_window.py * added webpublisher settings conversion * added maya conversion function * reuse variable * reuse variable (similar to previous commit) * fix ayon addons loading * fix typo 'AyonSettingsCahe' -> 'AyonSettingsCache' * fix enabled state changes * fix rr_path in royal render conversion * avoid mongo calls in AYON state * implemented custom AYON start script * fix formatting (after black) * ayon_start cleanup * 'get_addons_dir' and 'get_dependencies_dir' store value to environment variable * add docstrings to local dir functions * addon info has full name * fix modules enabled states * removed unused 'run_disk_mapping_commands' * removed ayon logic from 'start.py' * fix warning message * renamed 'openpype_common' to 'ayon_common' * removed unused import * don't import igniter * removed startup validations of third parties * change what's shown in version info * fix which keys are applied from ayon values * fix method name * get applications from attribs * Implemented UI basics to be able change user or logout * merged server.py and credentials.py * add more metadata to urls * implemented change token * implemented change user ui functionality * implemented change user ui * modify window to handle username and token value * pass username to add server * fix show UI cases * added loggin action to tray * update ayon api * added missing dependency * convert applications to config in a right way * initial implementation of 'nuke' settings conversion * removed few nuke comments * implemented hiero conversion * added imageio conversion * added run ayon tray script * fix few settings conversions * Renamed class of source classes as they are not just for addons * implemented objec to track source transfer progress * Implemented distribution item with multiple sources * Implemented ayon distribution wrapper to care about multiple things during distribution * added 'cleanup' method for downlaoders * download gets tranfer progress object * Change UploadState enum * added missing imports * use AyonDistribution in ayon_start.py * removed unused functions * removed implemented TODOs * fix import * fix key used for Web source * removed temp development fix * formatting fix * keep information if source require distribution * handle 'require_distribution' attribute in distribution process * added path attribute to server source * added option to pass addons infor to ayon distribution * fix tests * fix formatting * Fix typo * Fix typo * remove '_try_convert_to_server_source' * renamed attributes and methods to match their content * it is possible to pass dependency package info to AyonDistribution * fix called methods in tests * added public properties for error message and error detail * Added filename to WebSourceInfo Useful for GDrive sharable links where target file name is unknown/unparsable, it should be provided explicitly. * unify source conversion by adding 'convert_source' function * Fix error message Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com> * added docstring for 'transfer_progress' * don't create metadata file on read * added few docstrings * add default folder fields to folder/task queries * fix generators * add dependencies when runnign from code * add sys paths from distribution to pythonpath env * fix missing applications * added missing conversions for maya renderers * fix formatting * update ayon api * fix hashes in lock file * Use better exception Co-authored-by: Ondřej Samohel <33513211+antirotor@users.noreply.github.com> * Use Python 3 syntax Co-authored-by: Ondřej Samohel <33513211+antirotor@users.noreply.github.com> * apply some of sugested changes in ayon_start * added some docstrings and suggested modifications * copy create env from develop * fix rendersettings conversion * change code by suggestions * added missing args to docstring * added missing docstrings * separated downloader and download factory * fix ayon settings * added some basic file docstring to ayon_settings * join else conditions * fix project settings conversion * fix created at conversion * fix workfile info query * fix publisher UI * added utils function 'get_ayon_appdirs' * fix 'get_all_current_info' * fix server url assignment when url is set * updated ayon api * added utils functions to create local site id for ayon * added helper functions to create global connection * create global connection in ayon start to start use site id * use ayon site id in ayon mode * formatting cleanup * added header docstring * fixes after ayon_api update * load addons from ynput appdirs * fix function call * added docstring * update ayon pyton api * fix settings access * use ayon_api to get root overrides in Anatomy * bumbayon version to 0.1.13 * nuke: fixing settings keys from settings * fix burnins definitions * change v4 to AYON in thumbnail integrate * fix one more v4 information * Fixes after rebase * fix extract burnin conversion * additional fix of extract burnin * SiteSync:added missed loaders or v3 compatibility (#4587) * Added site sync loaders for v3 compatibility * Fix get_progress_for_repre * use 'files.name' instead of 'files.baseName' * update ayon api to 0.1.14 * add common to include files * change arguments for hero version creation * skip shotgrid settings conversion if different ayon addon is used * added ayon icons * fix labels of application variants * added option to show login window always on top * login window on invalid credentials is always on top * update ayon api * update ayon api * add entityType to project and folders * AYON: Editorial hierarchy creation (#4699) * disable extract hierarchy avalon when ayon mode is enabled * implemented extract hierarchy to AYON --------- Co-authored-by: Petr Kalis <petr.kalis@gmail.com> Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com> Co-authored-by: Ondřej Samohel <33513211+antirotor@users.noreply.github.com> Co-authored-by: Jakub Jezek <jakubjezek001@gmail.com> * replace 'legacy_io' with context functions in load plugins * added 'get_global_context' to pipeline init * use context getters instead of legacy_io in publish plugins * use data on context instead of 'legacy_io' in submit publish job * skip query of asset docs in collect nuke reads * use context functions on other places * 'list_looks' expects project name * remove 'get_context_title' * don't pass AvalonMongoDB to prelaunch hooks * change how context is calculated in hiero * implemented function 'get_fps_for_current_context' for maya * initialize '_image_dir' and '_image_prefixes' in init * legacy creator is using 'get_current_project_name' * fill docstrings * use context functions in workfile builders * hound fixes * 'create_workspace_mel' can expect project settings * swapped order of arguments * use information from instance/context data * Use self.project_name in workfiles tool Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com> * Remove outdated todo Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com> * don't query project document in nuke lib * Fix access to context data * Use right function to get project name Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com> * fix submit max deadline and swap order of arguments * added 'get_context_label' to nuke * fix import * fix typo 'curent_context' -> 'current_context' * fix project_setting variable * fix submit publish job environments * use task from context * Removed unused import --------- Co-authored-by: Petr Kalis <petr.kalis@gmail.com> Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com> Co-authored-by: Ondřej Samohel <33513211+antirotor@users.noreply.github.com> Co-authored-by: Jakub Jezek <jakubjezek001@gmail.com>
238 lines
7.3 KiB
Python
238 lines
7.3 KiB
Python
"""This Webserver tool is python 3 specific.
|
|
|
|
Don't import directly to avalon.tools or implementation of Python 2 hosts
|
|
would break.
|
|
"""
|
|
import os
|
|
import logging
|
|
import urllib
|
|
import threading
|
|
import asyncio
|
|
import socket
|
|
|
|
from aiohttp import web
|
|
|
|
from wsrpc_aiohttp import (
|
|
WSRPCClient
|
|
)
|
|
|
|
from openpype.pipeline import get_global_context
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
|
|
class WebServerTool:
|
|
"""
|
|
Basic POC implementation of asychronic websocket RPC server.
|
|
Uses class in external_app_1.py to mimic implementation for single
|
|
external application.
|
|
'test_client' folder contains two test implementations of client
|
|
"""
|
|
_instance = None
|
|
|
|
def __init__(self):
|
|
WebServerTool._instance = self
|
|
|
|
self.client = None
|
|
self.handlers = {}
|
|
self.on_stop_callbacks = []
|
|
|
|
port = None
|
|
host_name = "localhost"
|
|
websocket_url = os.getenv("WEBSOCKET_URL")
|
|
if websocket_url:
|
|
parsed = urllib.parse.urlparse(websocket_url)
|
|
port = parsed.port
|
|
host_name = parsed.netloc.split(":")[0]
|
|
if not port:
|
|
port = 8098 # fallback
|
|
|
|
self.port = port
|
|
self.host_name = host_name
|
|
|
|
self.app = web.Application()
|
|
|
|
# add route with multiple methods for single "external app"
|
|
self.webserver_thread = WebServerThread(self, self.port)
|
|
|
|
def add_route(self, *args, **kwargs):
|
|
self.app.router.add_route(*args, **kwargs)
|
|
|
|
def add_static(self, *args, **kwargs):
|
|
self.app.router.add_static(*args, **kwargs)
|
|
|
|
def start_server(self):
|
|
if self.webserver_thread and not self.webserver_thread.is_alive():
|
|
self.webserver_thread.start()
|
|
|
|
def stop_server(self):
|
|
self.stop()
|
|
|
|
async def send_context_change(self, host):
|
|
"""
|
|
Calls running webserver to inform about context change
|
|
|
|
Used when new PS/AE should be triggered,
|
|
but one already running, without
|
|
this publish would point to old context.
|
|
"""
|
|
client = WSRPCClient(os.getenv("WEBSOCKET_URL"),
|
|
loop=asyncio.get_event_loop())
|
|
await client.connect()
|
|
|
|
context = get_global_context()
|
|
project = context["project_name"]
|
|
asset = context["asset_name"]
|
|
task = context["task_name"]
|
|
log.info("Sending context change to {}-{}-{}".format(project,
|
|
asset,
|
|
task))
|
|
|
|
await client.call('{}.set_context'.format(host),
|
|
project=project, asset=asset, task=task)
|
|
await client.close()
|
|
|
|
def port_occupied(self, host_name, port):
|
|
"""
|
|
Check if 'url' is already occupied.
|
|
|
|
This could mean, that app is already running and we are trying open it
|
|
again. In that case, use existing running webserver.
|
|
Check here is easier than capturing exception from thread.
|
|
"""
|
|
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
result = True
|
|
try:
|
|
sock.bind((host_name, port))
|
|
result = False
|
|
except:
|
|
print("Port is in use")
|
|
|
|
return result
|
|
|
|
def call(self, func):
|
|
log.debug("websocket.call {}".format(func))
|
|
future = asyncio.run_coroutine_threadsafe(
|
|
func,
|
|
self.webserver_thread.loop
|
|
)
|
|
result = future.result()
|
|
return result
|
|
|
|
@staticmethod
|
|
def get_instance():
|
|
if WebServerTool._instance is None:
|
|
WebServerTool()
|
|
return WebServerTool._instance
|
|
|
|
@property
|
|
def is_running(self):
|
|
if not self.webserver_thread:
|
|
return False
|
|
return self.webserver_thread.is_running
|
|
|
|
def stop(self):
|
|
if not self.is_running:
|
|
return
|
|
try:
|
|
log.debug("Stopping websocket server")
|
|
self.webserver_thread.is_running = False
|
|
self.webserver_thread.stop()
|
|
except Exception:
|
|
log.warning(
|
|
"Error has happened during Killing websocket server",
|
|
exc_info=True
|
|
)
|
|
|
|
def thread_stopped(self):
|
|
for callback in self.on_stop_callbacks:
|
|
callback()
|
|
|
|
|
|
class WebServerThread(threading.Thread):
|
|
""" Listener for websocket rpc requests.
|
|
|
|
It would be probably better to "attach" this to main thread (as for
|
|
example Harmony needs to run something on main thread), but currently
|
|
it creates separate thread and separate asyncio event loop
|
|
"""
|
|
def __init__(self, module, port):
|
|
super(WebServerThread, self).__init__()
|
|
|
|
self.is_running = False
|
|
self.port = port
|
|
self.module = module
|
|
self.loop = None
|
|
self.runner = None
|
|
self.site = None
|
|
self.tasks = []
|
|
|
|
def run(self):
|
|
self.is_running = True
|
|
|
|
try:
|
|
log.info("Starting web server")
|
|
self.loop = asyncio.new_event_loop() # create new loop for thread
|
|
asyncio.set_event_loop(self.loop)
|
|
|
|
self.loop.run_until_complete(self.start_server())
|
|
|
|
websocket_url = "ws://localhost:{}/ws".format(self.port)
|
|
|
|
log.debug(
|
|
"Running Websocket server on URL: \"{}\"".format(websocket_url)
|
|
)
|
|
|
|
asyncio.ensure_future(self.check_shutdown(), loop=self.loop)
|
|
self.loop.run_forever()
|
|
except Exception:
|
|
self.is_running = False
|
|
log.warning(
|
|
"Websocket Server service has failed", exc_info=True
|
|
)
|
|
raise
|
|
finally:
|
|
self.loop.close() # optional
|
|
|
|
self.is_running = False
|
|
self.module.thread_stopped()
|
|
log.info("Websocket server stopped")
|
|
|
|
async def start_server(self):
|
|
""" Starts runner and TCPsite """
|
|
self.runner = web.AppRunner(self.module.app)
|
|
await self.runner.setup()
|
|
self.site = web.TCPSite(self.runner, 'localhost', self.port)
|
|
await self.site.start()
|
|
|
|
def stop(self):
|
|
"""Sets is_running flag to false, 'check_shutdown' shuts server down"""
|
|
self.is_running = False
|
|
|
|
async def check_shutdown(self):
|
|
""" Future that is running and checks if server should be running
|
|
periodically.
|
|
"""
|
|
while self.is_running:
|
|
while self.tasks:
|
|
task = self.tasks.pop(0)
|
|
log.debug("waiting for task {}".format(task))
|
|
await task
|
|
log.debug("returned value {}".format(task.result))
|
|
|
|
await asyncio.sleep(0.5)
|
|
|
|
log.debug("Starting shutdown")
|
|
await self.site.stop()
|
|
log.debug("Site stopped")
|
|
await self.runner.cleanup()
|
|
log.debug("Runner stopped")
|
|
tasks = [task for task in asyncio.all_tasks() if
|
|
task is not asyncio.current_task()]
|
|
list(map(lambda task: task.cancel(), tasks)) # cancel all the tasks
|
|
results = await asyncio.gather(*tasks, return_exceptions=True)
|
|
log.debug(f'Finished awaiting cancelled tasks, results: {results}...')
|
|
await self.loop.shutdown_asyncgens()
|
|
# to really make sure everything else has time to stop
|
|
await asyncio.sleep(0.07)
|
|
self.loop.stop()
|