diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml new file mode 100644 index 0000000000..bc08868dc1 --- /dev/null +++ b/.github/workflows/documentation.yml @@ -0,0 +1,63 @@ +name: documentation + +on: + pull_request: + branches: [develop] + types: [review_requested, ready_for_review] + paths: + - 'website/**' + push: + branches: [main] + paths: + - 'website/**' + +jobs: + check-build: + if: github.event_name != 'push' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: actions/setup-node@v1 + with: + node-version: '12.x' + - name: Test Build + run: | + cd website + if [ -e yarn.lock ]; then + yarn install --frozen-lockfile + elif [ -e package-lock.json ]; then + npm ci + else + npm i + fi + npm run build + deploy-website: + if: github.event_name != 'pull_request' + runs-on: ubuntu-latest + steps: + - name: 🚚 Get latest code + uses: actions/checkout@v2 + + - uses: actions/setup-node@v1 + with: + node-version: '12.x' + + - name: 🔨 Build + run: | + cd website + if [ -e yarn.lock ]; then + yarn install --frozen-lockfile + elif [ -e package-lock.json ]; then + npm ci + else + npm i + fi + npm run build + + - name: 📂 Sync files + uses: SamKirkland/FTP-Deploy-Action@4.0.0 + with: + server: ftp.openpype.io + username: ${{ secrets.ftp_user }} + password: ${{ secrets.ftp_password }} + local-dir: ./website/build/ \ No newline at end of file diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml new file mode 100644 index 0000000000..6e1e38d0b2 --- /dev/null +++ b/.github/workflows/test_build.yml @@ -0,0 +1,88 @@ +# This workflow will upload a Python Package using Twine when a release is created +# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries + +name: Test Build + +on: + pull_request: + branches: [develop] + types: [review_requested, ready_for_review] + paths-ignore: + - 'docs/**' + - 'website/**' + - 'vendor/**' + +jobs: + Windows-latest: + + runs-on: windows-latest + strategy: + matrix: + python-version: [3.7] + + steps: + - name: 🚛 Checkout Code + uses: actions/checkout@v2 + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + + - name: 🧵 Install Requirements + shell: pwsh + run: | + ./tools/create_env.ps1 + + - name: 🔨 Build + shell: pwsh + run: | + ./tools/build.ps1 + + Ubuntu-latest: + + runs-on: ubuntu-latest + strategy: + matrix: + python-version: [3.7] + + steps: + - name: 🚛 Checkout Code + uses: actions/checkout@v2 + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + + - name: 🧵 Install Requirements + run: | + ./tools/create_env.sh + + - name: 🔨 Build + run: | + ./tools/build.sh + + # MacOS-latest: + + # runs-on: macos-latest + # strategy: + # matrix: + # python-version: [3.7] + + # steps: + # - name: 🚛 Checkout Code + # uses: actions/checkout@v2 + + # - name: Set up Python + # uses: actions/setup-python@v2 + # with: + # python-version: ${{ matrix.python-version }} + + # - name: 🧵 Install Requirements + # run: | + # ./tools/create_env.sh + + # - name: 🔨 Build + # run: | + # ./tools/build.sh \ No newline at end of file diff --git a/.gitignore b/.gitignore index bc20e13873..ba8805e013 100644 --- a/.gitignore +++ b/.gitignore @@ -67,7 +67,7 @@ coverage.xml # Node JS packages ################## -node_modules/ +node_modules package-lock.json openpype/premiere/ppro/js/debug.log @@ -81,4 +81,15 @@ openpype/premiere/ppro/js/debug.log .vscode/ .env dump.sql -test_localsystem.txt \ No newline at end of file +test_localsystem.txt + +# website +########## +website/translated_docs +website/build/ +website/node_modules +website/i18n/* + +website/debug.log + +website/.docusaurus \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index d286419ee5..7e6b7cb861 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,13 +1,13 @@ [submodule "repos/avalon-core"] path = repos/avalon-core - url = git@github.com:pypeclub/avalon-core.git + url = https://github.com/pypeclub/avalon-core.git branch = develop [submodule "repos/avalon-unreal-integration"] path = repos/avalon-unreal-integration - url = git@github.com:pypeclub/avalon-unreal-integration.git + url = https://github.com/pypeclub/avalon-unreal-integration.git [submodule "openpype/modules/ftrack/python2_vendor/ftrack-python-api"] path = openpype/modules/ftrack/python2_vendor/ftrack-python-api url = https://bitbucket.org/ftrack/ftrack-python-api.git [submodule "openpype/modules/ftrack/python2_vendor/arrow"] path = openpype/modules/ftrack/python2_vendor/arrow - url = git@github.com:arrow-py/arrow.git \ No newline at end of file + url = https://github.com/arrow-py/arrow.git \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 70e23e0ff8..364555f8b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,264 @@ # Changelog -## [2.14.0](https://github.com/pypeclub/pype/tree/2.14.0) (2020-11-24) +## [2.16.1](https://github.com/pypeclub/pype/tree/2.16.1) (2021-04-13) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.16.0...2.16.1) + +**Enhancements:** + +- Nuke: comp renders mix up [\#1301](https://github.com/pypeclub/pype/pull/1301) +- Validate project settings [\#1297](https://github.com/pypeclub/pype/pull/1297) +- After Effects: added SubsetManager [\#1234](https://github.com/pypeclub/pype/pull/1234) + +**Fixed bugs:** + +- Ftrack custom attributes in bulks [\#1312](https://github.com/pypeclub/pype/pull/1312) +- Ftrack optional pypclub role [\#1303](https://github.com/pypeclub/pype/pull/1303) +- AE remove orphaned instance from workfile - fix self.stub [\#1282](https://github.com/pypeclub/pype/pull/1282) +- Avalon schema names [\#1242](https://github.com/pypeclub/pype/pull/1242) +- Handle duplication of Task name [\#1226](https://github.com/pypeclub/pype/pull/1226) +- Modified path of plugin loads for Harmony and TVPaint [\#1217](https://github.com/pypeclub/pype/pull/1217) +- Regex checks in profiles filtering [\#1214](https://github.com/pypeclub/pype/pull/1214) +- Bulk mov strict task [\#1204](https://github.com/pypeclub/pype/pull/1204) +- Update custom ftrack session attributes [\#1202](https://github.com/pypeclub/pype/pull/1202) +- Nuke: write node colorspace ignore `default\(\)` label [\#1199](https://github.com/pypeclub/pype/pull/1199) +- Nuke: reverse search to make it more versatile [\#1178](https://github.com/pypeclub/pype/pull/1178) + +**Merged pull requests:** + +- Forward compatible ftrack group [\#1243](https://github.com/pypeclub/pype/pull/1243) +- Error message in pyblish UI [\#1206](https://github.com/pypeclub/pype/pull/1206) +- Nuke: deadline submission with search replaced env values from preset [\#1194](https://github.com/pypeclub/pype/pull/1194) + +## [2.16.0](https://github.com/pypeclub/pype/tree/2.16.0) (2021-03-22) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.15.3...2.16.0) + +**Enhancements:** + +- Nuke: deadline submit limit group filter [\#1167](https://github.com/pypeclub/pype/pull/1167) +- Maya: support for Deadline Group and Limit Groups - backport 2.x [\#1156](https://github.com/pypeclub/pype/pull/1156) +- Maya: fixes for Redshift support [\#1152](https://github.com/pypeclub/pype/pull/1152) +- Nuke: adding preset for a Read node name to all img and mov Loaders [\#1146](https://github.com/pypeclub/pype/pull/1146) +- nuke deadline submit with environ var from presets overrides [\#1142](https://github.com/pypeclub/pype/pull/1142) +- Change timers after task change [\#1138](https://github.com/pypeclub/pype/pull/1138) +- Nuke: shortcuts for Pype menu [\#1127](https://github.com/pypeclub/pype/pull/1127) +- Nuke: workfile template [\#1124](https://github.com/pypeclub/pype/pull/1124) +- Sites local settings by site name [\#1117](https://github.com/pypeclub/pype/pull/1117) +- Reset loader's asset selection on context change [\#1106](https://github.com/pypeclub/pype/pull/1106) +- Bulk mov render publishing [\#1101](https://github.com/pypeclub/pype/pull/1101) +- Photoshop: mark publishable instances [\#1093](https://github.com/pypeclub/pype/pull/1093) +- Added ability to define BG color for extract review [\#1088](https://github.com/pypeclub/pype/pull/1088) +- TVPaint extractor enhancement [\#1080](https://github.com/pypeclub/pype/pull/1080) +- Photoshop: added support for .psb in workfiles [\#1078](https://github.com/pypeclub/pype/pull/1078) +- Optionally add task to subset name [\#1072](https://github.com/pypeclub/pype/pull/1072) +- Only extend clip range when collecting. [\#1008](https://github.com/pypeclub/pype/pull/1008) +- Collect audio for farm reviews. [\#1073](https://github.com/pypeclub/pype/pull/1073) + + +**Fixed bugs:** + +- Fix path spaces in jpeg extractor [\#1174](https://github.com/pypeclub/pype/pull/1174) +- Maya: Bugfix: superclass for CreateCameraRig [\#1166](https://github.com/pypeclub/pype/pull/1166) +- Maya: Submit to Deadline - fix typo in condition [\#1163](https://github.com/pypeclub/pype/pull/1163) +- Avoid dot in repre extension [\#1125](https://github.com/pypeclub/pype/pull/1125) +- Fix versions variable usage in standalone publisher [\#1090](https://github.com/pypeclub/pype/pull/1090) +- Collect instance data fix subset query [\#1082](https://github.com/pypeclub/pype/pull/1082) +- Fix getting the camera name. [\#1067](https://github.com/pypeclub/pype/pull/1067) +- Nuke: Ensure "NUKE\_TEMP\_DIR" is not part of the Deadline job environment. [\#1064](https://github.com/pypeclub/pype/pull/1064) + +## [2.15.3](https://github.com/pypeclub/pype/tree/2.15.3) (2021-02-26) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.15.2...2.15.3) + +**Enhancements:** + +- Maya: speedup renderable camera collection [\#1053](https://github.com/pypeclub/pype/pull/1053) +- Harmony - add regex search to filter allowed task names for collectin… [\#1047](https://github.com/pypeclub/pype/pull/1047) + +**Fixed bugs:** + +- Ftrack integrate hierarchy fix [\#1085](https://github.com/pypeclub/pype/pull/1085) +- Explicit subset filter in anatomy instance data [\#1059](https://github.com/pypeclub/pype/pull/1059) +- TVPaint frame offset [\#1057](https://github.com/pypeclub/pype/pull/1057) +- Auto fix unicode strings [\#1046](https://github.com/pypeclub/pype/pull/1046) + +## [2.15.2](https://github.com/pypeclub/pype/tree/2.15.2) (2021-02-19) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.15.1...2.15.2) + +**Enhancements:** + +- Maya: Vray scene publishing [\#1013](https://github.com/pypeclub/pype/pull/1013) + +**Fixed bugs:** + +- Fix entity move under project [\#1040](https://github.com/pypeclub/pype/pull/1040) +- smaller nuke fixes from production [\#1036](https://github.com/pypeclub/pype/pull/1036) +- TVPaint thumbnail extract fix [\#1031](https://github.com/pypeclub/pype/pull/1031) + +## [2.15.1](https://github.com/pypeclub/pype/tree/2.15.1) (2021-02-12) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.15.0...2.15.1) + +**Enhancements:** + +- Delete version as loader action [\#1011](https://github.com/pypeclub/pype/pull/1011) +- Delete old versions [\#445](https://github.com/pypeclub/pype/pull/445) + +**Fixed bugs:** + +- PS - remove obsolete functions from pywin32 [\#1006](https://github.com/pypeclub/pype/pull/1006) +- Clone description of review session objects. [\#922](https://github.com/pypeclub/pype/pull/922) + +## [2.15.0](https://github.com/pypeclub/pype/tree/2.15.0) (2021-02-09) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.6...2.15.0) + +**Enhancements:** + +- Resolve - loading and updating clips [\#932](https://github.com/pypeclub/pype/pull/932) +- Release/2.15.0 [\#926](https://github.com/pypeclub/pype/pull/926) +- Photoshop: add option for template.psd and prelaunch hook [\#894](https://github.com/pypeclub/pype/pull/894) +- Nuke: deadline presets [\#993](https://github.com/pypeclub/pype/pull/993) +- Maya: Alembic only set attributes that exists. [\#986](https://github.com/pypeclub/pype/pull/986) +- Harmony: render local and handle fixes [\#981](https://github.com/pypeclub/pype/pull/981) +- PSD Bulk export of ANIM group [\#965](https://github.com/pypeclub/pype/pull/965) +- AE - added prelaunch hook for opening last or workfile from template [\#944](https://github.com/pypeclub/pype/pull/944) +- PS - safer handling of loading of workfile [\#941](https://github.com/pypeclub/pype/pull/941) +- Maya: Handling Arnold referenced AOVs [\#938](https://github.com/pypeclub/pype/pull/938) +- TVPaint: switch layer IDs for layer names during identification [\#903](https://github.com/pypeclub/pype/pull/903) +- TVPaint audio/sound loader [\#893](https://github.com/pypeclub/pype/pull/893) +- Clone review session with children. [\#891](https://github.com/pypeclub/pype/pull/891) +- Simple compositing data packager for freelancers [\#884](https://github.com/pypeclub/pype/pull/884) +- Harmony deadline submission [\#881](https://github.com/pypeclub/pype/pull/881) +- Maya: Optionally hide image planes from reviews. [\#840](https://github.com/pypeclub/pype/pull/840) +- Maya: handle referenced AOVs for Vray [\#824](https://github.com/pypeclub/pype/pull/824) +- DWAA/DWAB support on windows [\#795](https://github.com/pypeclub/pype/pull/795) +- Unreal: animation, layout and setdress updates [\#695](https://github.com/pypeclub/pype/pull/695) + +**Fixed bugs:** + +- Maya: Looks - disable hardlinks [\#995](https://github.com/pypeclub/pype/pull/995) +- Fix Ftrack custom attribute update [\#982](https://github.com/pypeclub/pype/pull/982) +- Prores ks in burnin script [\#960](https://github.com/pypeclub/pype/pull/960) +- terminal.py crash on import [\#839](https://github.com/pypeclub/pype/pull/839) +- Extract review handle bizarre pixel aspect ratio [\#990](https://github.com/pypeclub/pype/pull/990) +- Nuke: add nuke related env var to sumbission [\#988](https://github.com/pypeclub/pype/pull/988) +- Nuke: missing preset's variable [\#984](https://github.com/pypeclub/pype/pull/984) +- Get creator by name fix [\#979](https://github.com/pypeclub/pype/pull/979) +- Fix update of project's tasks on Ftrack sync [\#972](https://github.com/pypeclub/pype/pull/972) +- nuke: wrong frame offset in mov loader [\#971](https://github.com/pypeclub/pype/pull/971) +- Create project structure action fix multiroot [\#967](https://github.com/pypeclub/pype/pull/967) +- PS: remove pywin installation from hook [\#964](https://github.com/pypeclub/pype/pull/964) +- Prores ks in burnin script [\#959](https://github.com/pypeclub/pype/pull/959) +- Subset family is now stored in subset document [\#956](https://github.com/pypeclub/pype/pull/956) +- DJV new version arguments [\#954](https://github.com/pypeclub/pype/pull/954) +- TV Paint: Fix single frame Sequence [\#953](https://github.com/pypeclub/pype/pull/953) +- nuke: missing `file` knob update [\#933](https://github.com/pypeclub/pype/pull/933) +- Photoshop: Create from single layer was failing [\#920](https://github.com/pypeclub/pype/pull/920) +- Nuke: baking mov with correct colorspace inherited from write [\#909](https://github.com/pypeclub/pype/pull/909) +- Launcher fix actions discover [\#896](https://github.com/pypeclub/pype/pull/896) +- Get the correct file path for the updated mov. [\#889](https://github.com/pypeclub/pype/pull/889) +- Maya: Deadline submitter - shared data access violation [\#831](https://github.com/pypeclub/pype/pull/831) +- Maya: Take into account vray master AOV switch [\#822](https://github.com/pypeclub/pype/pull/822) + +**Merged pull requests:** + +- Refactor blender to 3.0 format [\#934](https://github.com/pypeclub/pype/pull/934) + +## [2.14.6](https://github.com/pypeclub/pype/tree/2.14.6) (2021-01-15) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.5...2.14.6) + +**Fixed bugs:** + +- Nuke: improving of hashing path [\#885](https://github.com/pypeclub/pype/pull/885) + +**Merged pull requests:** + +- Hiero: cut videos with correct secons [\#892](https://github.com/pypeclub/pype/pull/892) +- Faster sync to avalon preparation [\#869](https://github.com/pypeclub/pype/pull/869) + +## [2.14.5](https://github.com/pypeclub/pype/tree/2.14.5) (2021-01-06) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.4...2.14.5) + +**Merged pull requests:** + +- Pype logger refactor [\#866](https://github.com/pypeclub/pype/pull/866) + +## [2.14.4](https://github.com/pypeclub/pype/tree/2.14.4) (2020-12-18) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.3...2.14.4) + +**Merged pull requests:** + +- Fix - AE - added explicit cast to int [\#837](https://github.com/pypeclub/pype/pull/837) + +## [2.14.3](https://github.com/pypeclub/pype/tree/2.14.3) (2020-12-16) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.2...2.14.3) + +**Fixed bugs:** + +- TVPaint repair invalid metadata [\#809](https://github.com/pypeclub/pype/pull/809) +- Feature/push hier value to nonhier action [\#807](https://github.com/pypeclub/pype/pull/807) +- Harmony: fix palette and image sequence loader [\#806](https://github.com/pypeclub/pype/pull/806) + +**Merged pull requests:** + +- respecting space in path [\#823](https://github.com/pypeclub/pype/pull/823) + +## [2.14.2](https://github.com/pypeclub/pype/tree/2.14.2) (2020-12-04) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.1...2.14.2) + +**Enhancements:** + +- Collapsible wrapper in settings [\#767](https://github.com/pypeclub/pype/pull/767) + +**Fixed bugs:** + +- Harmony: template extraction and palettes thumbnails on mac [\#768](https://github.com/pypeclub/pype/pull/768) +- TVPaint store context to workfile metadata \(764\) [\#766](https://github.com/pypeclub/pype/pull/766) +- Extract review audio cut fix [\#763](https://github.com/pypeclub/pype/pull/763) + +**Merged pull requests:** + +- AE: fix publish after background load [\#781](https://github.com/pypeclub/pype/pull/781) +- TVPaint store members key [\#769](https://github.com/pypeclub/pype/pull/769) + +## [2.14.1](https://github.com/pypeclub/pype/tree/2.14.1) (2020-11-27) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.0...2.14.1) + +**Enhancements:** + +- Settings required keys in modifiable dict [\#770](https://github.com/pypeclub/pype/pull/770) +- Extract review may not add audio to output [\#761](https://github.com/pypeclub/pype/pull/761) + +**Fixed bugs:** + +- After Effects: frame range, file format and render source scene fixes [\#760](https://github.com/pypeclub/pype/pull/760) +- Hiero: trimming review with clip event number [\#754](https://github.com/pypeclub/pype/pull/754) +- TVPaint: fix updating of loaded subsets [\#752](https://github.com/pypeclub/pype/pull/752) +- Maya: Vray handling of default aov [\#748](https://github.com/pypeclub/pype/pull/748) +- Maya: multiple renderable cameras in layer didn't work [\#744](https://github.com/pypeclub/pype/pull/744) +- Ftrack integrate custom attributes fix [\#742](https://github.com/pypeclub/pype/pull/742) + +## [2.14.0](https://github.com/pypeclub/pype/tree/2.14.0) (2020-11-23) [Full Changelog](https://github.com/pypeclub/pype/compare/2.13.7...2.14.0) **Enhancements:** +- Render publish plugins abstraction [\#687](https://github.com/pypeclub/pype/pull/687) - Shot asset build trigger status [\#736](https://github.com/pypeclub/pype/pull/736) - Maya: add camera rig publishing option [\#721](https://github.com/pypeclub/pype/pull/721) - Sort instances by label in pyblish gui [\#719](https://github.com/pypeclub/pype/pull/719) - Synchronize ftrack hierarchical and shot attributes [\#716](https://github.com/pypeclub/pype/pull/716) - 686 standalonepublisher editorial from image sequences [\#699](https://github.com/pypeclub/pype/pull/699) -- TV Paint: initial implementation of creators and local rendering [\#693](https://github.com/pypeclub/pype/pull/693) -- Render publish plugins abstraction [\#687](https://github.com/pypeclub/pype/pull/687) - Ask user to select non-default camera from scene or create a new. [\#678](https://github.com/pypeclub/pype/pull/678) - TVPaint: image loader with options [\#675](https://github.com/pypeclub/pype/pull/675) - Maya: Camera name can be added to burnins. [\#674](https://github.com/pypeclub/pype/pull/674) @@ -21,25 +267,33 @@ **Fixed bugs:** +- Bugfix Hiero Review / Plate representation publish [\#743](https://github.com/pypeclub/pype/pull/743) +- Asset fetch second fix [\#726](https://github.com/pypeclub/pype/pull/726) - TVPaint extract review fix [\#740](https://github.com/pypeclub/pype/pull/740) - After Effects: Review were not being sent to ftrack [\#738](https://github.com/pypeclub/pype/pull/738) -- Asset fetch second fix [\#726](https://github.com/pypeclub/pype/pull/726) - Maya: vray proxy was not loading [\#722](https://github.com/pypeclub/pype/pull/722) - Maya: Vray expected file fixes [\#682](https://github.com/pypeclub/pype/pull/682) +- Missing audio on farm submission. [\#639](https://github.com/pypeclub/pype/pull/639) **Deprecated:** - Removed artist view from pyblish gui [\#717](https://github.com/pypeclub/pype/pull/717) - Maya: disable legacy override check for cameras [\#715](https://github.com/pypeclub/pype/pull/715) +**Merged pull requests:** + +- Application manager [\#728](https://github.com/pypeclub/pype/pull/728) +- Feature \#664 3.0 lib refactor [\#706](https://github.com/pypeclub/pype/pull/706) +- Lib from illicit part 2 [\#700](https://github.com/pypeclub/pype/pull/700) +- 3.0 lib refactor - path tools [\#697](https://github.com/pypeclub/pype/pull/697) ## [2.13.7](https://github.com/pypeclub/pype/tree/2.13.7) (2020-11-19) [Full Changelog](https://github.com/pypeclub/pype/compare/2.13.6...2.13.7) -**Merged pull requests:** +**Fixed bugs:** -- fix\(SP\): getting fps from context instead of nonexistent entity [\#729](https://github.com/pypeclub/pype/pull/729) +- Standalone Publisher: getting fps from context instead of nonexistent entity [\#729](https://github.com/pypeclub/pype/pull/729) # Changelog diff --git a/HISTORY.md b/HISTORY.md index b8b96fb4c3..053059a9ea 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,268 @@ +## [2.16.0](https://github.com/pypeclub/pype/tree/2.16.0) (2021-03-22) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.15.3...2.16.0) + +**Enhancements:** + +- Nuke: deadline submit limit group filter [\#1167](https://github.com/pypeclub/pype/pull/1167) +- Maya: support for Deadline Group and Limit Groups - backport 2.x [\#1156](https://github.com/pypeclub/pype/pull/1156) +- Maya: fixes for Redshift support [\#1152](https://github.com/pypeclub/pype/pull/1152) +- Nuke: adding preset for a Read node name to all img and mov Loaders [\#1146](https://github.com/pypeclub/pype/pull/1146) +- nuke deadline submit with environ var from presets overrides [\#1142](https://github.com/pypeclub/pype/pull/1142) +- Change timers after task change [\#1138](https://github.com/pypeclub/pype/pull/1138) +- Nuke: shortcuts for Pype menu [\#1127](https://github.com/pypeclub/pype/pull/1127) +- Nuke: workfile template [\#1124](https://github.com/pypeclub/pype/pull/1124) +- Sites local settings by site name [\#1117](https://github.com/pypeclub/pype/pull/1117) +- Reset loader's asset selection on context change [\#1106](https://github.com/pypeclub/pype/pull/1106) +- Bulk mov render publishing [\#1101](https://github.com/pypeclub/pype/pull/1101) +- Photoshop: mark publishable instances [\#1093](https://github.com/pypeclub/pype/pull/1093) +- Added ability to define BG color for extract review [\#1088](https://github.com/pypeclub/pype/pull/1088) +- TVPaint extractor enhancement [\#1080](https://github.com/pypeclub/pype/pull/1080) +- Photoshop: added support for .psb in workfiles [\#1078](https://github.com/pypeclub/pype/pull/1078) +- Optionally add task to subset name [\#1072](https://github.com/pypeclub/pype/pull/1072) +- Only extend clip range when collecting. [\#1008](https://github.com/pypeclub/pype/pull/1008) +- Collect audio for farm reviews. [\#1073](https://github.com/pypeclub/pype/pull/1073) + + +**Fixed bugs:** + +- Fix path spaces in jpeg extractor [\#1174](https://github.com/pypeclub/pype/pull/1174) +- Maya: Bugfix: superclass for CreateCameraRig [\#1166](https://github.com/pypeclub/pype/pull/1166) +- Maya: Submit to Deadline - fix typo in condition [\#1163](https://github.com/pypeclub/pype/pull/1163) +- Avoid dot in repre extension [\#1125](https://github.com/pypeclub/pype/pull/1125) +- Fix versions variable usage in standalone publisher [\#1090](https://github.com/pypeclub/pype/pull/1090) +- Collect instance data fix subset query [\#1082](https://github.com/pypeclub/pype/pull/1082) +- Fix getting the camera name. [\#1067](https://github.com/pypeclub/pype/pull/1067) +- Nuke: Ensure "NUKE\_TEMP\_DIR" is not part of the Deadline job environment. [\#1064](https://github.com/pypeclub/pype/pull/1064) + +## [2.15.3](https://github.com/pypeclub/pype/tree/2.15.3) (2021-02-26) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.15.2...2.15.3) + +**Enhancements:** + +- Maya: speedup renderable camera collection [\#1053](https://github.com/pypeclub/pype/pull/1053) +- Harmony - add regex search to filter allowed task names for collectin… [\#1047](https://github.com/pypeclub/pype/pull/1047) + +**Fixed bugs:** + +- Ftrack integrate hierarchy fix [\#1085](https://github.com/pypeclub/pype/pull/1085) +- Explicit subset filter in anatomy instance data [\#1059](https://github.com/pypeclub/pype/pull/1059) +- TVPaint frame offset [\#1057](https://github.com/pypeclub/pype/pull/1057) +- Auto fix unicode strings [\#1046](https://github.com/pypeclub/pype/pull/1046) + +## [2.15.2](https://github.com/pypeclub/pype/tree/2.15.2) (2021-02-19) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.15.1...2.15.2) + +**Enhancements:** + +- Maya: Vray scene publishing [\#1013](https://github.com/pypeclub/pype/pull/1013) + +**Fixed bugs:** + +- Fix entity move under project [\#1040](https://github.com/pypeclub/pype/pull/1040) +- smaller nuke fixes from production [\#1036](https://github.com/pypeclub/pype/pull/1036) +- TVPaint thumbnail extract fix [\#1031](https://github.com/pypeclub/pype/pull/1031) + +## [2.15.1](https://github.com/pypeclub/pype/tree/2.15.1) (2021-02-12) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.15.0...2.15.1) + +**Enhancements:** + +- Delete version as loader action [\#1011](https://github.com/pypeclub/pype/pull/1011) +- Delete old versions [\#445](https://github.com/pypeclub/pype/pull/445) + +**Fixed bugs:** + +- PS - remove obsolete functions from pywin32 [\#1006](https://github.com/pypeclub/pype/pull/1006) +- Clone description of review session objects. [\#922](https://github.com/pypeclub/pype/pull/922) + +## [2.15.0](https://github.com/pypeclub/pype/tree/2.15.0) (2021-02-09) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.6...2.15.0) + +**Enhancements:** + +- Resolve - loading and updating clips [\#932](https://github.com/pypeclub/pype/pull/932) +- Release/2.15.0 [\#926](https://github.com/pypeclub/pype/pull/926) +- Photoshop: add option for template.psd and prelaunch hook [\#894](https://github.com/pypeclub/pype/pull/894) +- Nuke: deadline presets [\#993](https://github.com/pypeclub/pype/pull/993) +- Maya: Alembic only set attributes that exists. [\#986](https://github.com/pypeclub/pype/pull/986) +- Harmony: render local and handle fixes [\#981](https://github.com/pypeclub/pype/pull/981) +- PSD Bulk export of ANIM group [\#965](https://github.com/pypeclub/pype/pull/965) +- AE - added prelaunch hook for opening last or workfile from template [\#944](https://github.com/pypeclub/pype/pull/944) +- PS - safer handling of loading of workfile [\#941](https://github.com/pypeclub/pype/pull/941) +- Maya: Handling Arnold referenced AOVs [\#938](https://github.com/pypeclub/pype/pull/938) +- TVPaint: switch layer IDs for layer names during identification [\#903](https://github.com/pypeclub/pype/pull/903) +- TVPaint audio/sound loader [\#893](https://github.com/pypeclub/pype/pull/893) +- Clone review session with children. [\#891](https://github.com/pypeclub/pype/pull/891) +- Simple compositing data packager for freelancers [\#884](https://github.com/pypeclub/pype/pull/884) +- Harmony deadline submission [\#881](https://github.com/pypeclub/pype/pull/881) +- Maya: Optionally hide image planes from reviews. [\#840](https://github.com/pypeclub/pype/pull/840) +- Maya: handle referenced AOVs for Vray [\#824](https://github.com/pypeclub/pype/pull/824) +- DWAA/DWAB support on windows [\#795](https://github.com/pypeclub/pype/pull/795) +- Unreal: animation, layout and setdress updates [\#695](https://github.com/pypeclub/pype/pull/695) + +**Fixed bugs:** + +- Maya: Looks - disable hardlinks [\#995](https://github.com/pypeclub/pype/pull/995) +- Fix Ftrack custom attribute update [\#982](https://github.com/pypeclub/pype/pull/982) +- Prores ks in burnin script [\#960](https://github.com/pypeclub/pype/pull/960) +- terminal.py crash on import [\#839](https://github.com/pypeclub/pype/pull/839) +- Extract review handle bizarre pixel aspect ratio [\#990](https://github.com/pypeclub/pype/pull/990) +- Nuke: add nuke related env var to sumbission [\#988](https://github.com/pypeclub/pype/pull/988) +- Nuke: missing preset's variable [\#984](https://github.com/pypeclub/pype/pull/984) +- Get creator by name fix [\#979](https://github.com/pypeclub/pype/pull/979) +- Fix update of project's tasks on Ftrack sync [\#972](https://github.com/pypeclub/pype/pull/972) +- nuke: wrong frame offset in mov loader [\#971](https://github.com/pypeclub/pype/pull/971) +- Create project structure action fix multiroot [\#967](https://github.com/pypeclub/pype/pull/967) +- PS: remove pywin installation from hook [\#964](https://github.com/pypeclub/pype/pull/964) +- Prores ks in burnin script [\#959](https://github.com/pypeclub/pype/pull/959) +- Subset family is now stored in subset document [\#956](https://github.com/pypeclub/pype/pull/956) +- DJV new version arguments [\#954](https://github.com/pypeclub/pype/pull/954) +- TV Paint: Fix single frame Sequence [\#953](https://github.com/pypeclub/pype/pull/953) +- nuke: missing `file` knob update [\#933](https://github.com/pypeclub/pype/pull/933) +- Photoshop: Create from single layer was failing [\#920](https://github.com/pypeclub/pype/pull/920) +- Nuke: baking mov with correct colorspace inherited from write [\#909](https://github.com/pypeclub/pype/pull/909) +- Launcher fix actions discover [\#896](https://github.com/pypeclub/pype/pull/896) +- Get the correct file path for the updated mov. [\#889](https://github.com/pypeclub/pype/pull/889) +- Maya: Deadline submitter - shared data access violation [\#831](https://github.com/pypeclub/pype/pull/831) +- Maya: Take into account vray master AOV switch [\#822](https://github.com/pypeclub/pype/pull/822) + +**Merged pull requests:** + +- Refactor blender to 3.0 format [\#934](https://github.com/pypeclub/pype/pull/934) + +## [2.14.6](https://github.com/pypeclub/pype/tree/2.14.6) (2021-01-15) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.5...2.14.6) + +**Fixed bugs:** + +- Nuke: improving of hashing path [\#885](https://github.com/pypeclub/pype/pull/885) + +**Merged pull requests:** + +- Hiero: cut videos with correct secons [\#892](https://github.com/pypeclub/pype/pull/892) +- Faster sync to avalon preparation [\#869](https://github.com/pypeclub/pype/pull/869) + +## [2.14.5](https://github.com/pypeclub/pype/tree/2.14.5) (2021-01-06) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.4...2.14.5) + +**Merged pull requests:** + +- Pype logger refactor [\#866](https://github.com/pypeclub/pype/pull/866) + +## [2.14.4](https://github.com/pypeclub/pype/tree/2.14.4) (2020-12-18) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.3...2.14.4) + +**Merged pull requests:** + +- Fix - AE - added explicit cast to int [\#837](https://github.com/pypeclub/pype/pull/837) + +## [2.14.3](https://github.com/pypeclub/pype/tree/2.14.3) (2020-12-16) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.2...2.14.3) + +**Fixed bugs:** + +- TVPaint repair invalid metadata [\#809](https://github.com/pypeclub/pype/pull/809) +- Feature/push hier value to nonhier action [\#807](https://github.com/pypeclub/pype/pull/807) +- Harmony: fix palette and image sequence loader [\#806](https://github.com/pypeclub/pype/pull/806) + +**Merged pull requests:** + +- respecting space in path [\#823](https://github.com/pypeclub/pype/pull/823) + +## [2.14.2](https://github.com/pypeclub/pype/tree/2.14.2) (2020-12-04) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.1...2.14.2) + +**Enhancements:** + +- Collapsible wrapper in settings [\#767](https://github.com/pypeclub/pype/pull/767) + +**Fixed bugs:** + +- Harmony: template extraction and palettes thumbnails on mac [\#768](https://github.com/pypeclub/pype/pull/768) +- TVPaint store context to workfile metadata \(764\) [\#766](https://github.com/pypeclub/pype/pull/766) +- Extract review audio cut fix [\#763](https://github.com/pypeclub/pype/pull/763) + +**Merged pull requests:** + +- AE: fix publish after background load [\#781](https://github.com/pypeclub/pype/pull/781) +- TVPaint store members key [\#769](https://github.com/pypeclub/pype/pull/769) + +## [2.14.1](https://github.com/pypeclub/pype/tree/2.14.1) (2020-11-27) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.0...2.14.1) + +**Enhancements:** + +- Settings required keys in modifiable dict [\#770](https://github.com/pypeclub/pype/pull/770) +- Extract review may not add audio to output [\#761](https://github.com/pypeclub/pype/pull/761) + +**Fixed bugs:** + +- After Effects: frame range, file format and render source scene fixes [\#760](https://github.com/pypeclub/pype/pull/760) +- Hiero: trimming review with clip event number [\#754](https://github.com/pypeclub/pype/pull/754) +- TVPaint: fix updating of loaded subsets [\#752](https://github.com/pypeclub/pype/pull/752) +- Maya: Vray handling of default aov [\#748](https://github.com/pypeclub/pype/pull/748) +- Maya: multiple renderable cameras in layer didn't work [\#744](https://github.com/pypeclub/pype/pull/744) +- Ftrack integrate custom attributes fix [\#742](https://github.com/pypeclub/pype/pull/742) + +## [2.14.0](https://github.com/pypeclub/pype/tree/2.14.0) (2020-11-23) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.13.7...2.14.0) + +**Enhancements:** + +- Render publish plugins abstraction [\#687](https://github.com/pypeclub/pype/pull/687) +- Shot asset build trigger status [\#736](https://github.com/pypeclub/pype/pull/736) +- Maya: add camera rig publishing option [\#721](https://github.com/pypeclub/pype/pull/721) +- Sort instances by label in pyblish gui [\#719](https://github.com/pypeclub/pype/pull/719) +- Synchronize ftrack hierarchical and shot attributes [\#716](https://github.com/pypeclub/pype/pull/716) +- 686 standalonepublisher editorial from image sequences [\#699](https://github.com/pypeclub/pype/pull/699) +- Ask user to select non-default camera from scene or create a new. [\#678](https://github.com/pypeclub/pype/pull/678) +- TVPaint: image loader with options [\#675](https://github.com/pypeclub/pype/pull/675) +- Maya: Camera name can be added to burnins. [\#674](https://github.com/pypeclub/pype/pull/674) +- After Effects: base integration with loaders [\#667](https://github.com/pypeclub/pype/pull/667) +- Harmony: Javascript refactoring and overall stability improvements [\#666](https://github.com/pypeclub/pype/pull/666) + +**Fixed bugs:** + +- Bugfix Hiero Review / Plate representation publish [\#743](https://github.com/pypeclub/pype/pull/743) +- Asset fetch second fix [\#726](https://github.com/pypeclub/pype/pull/726) +- TVPaint extract review fix [\#740](https://github.com/pypeclub/pype/pull/740) +- After Effects: Review were not being sent to ftrack [\#738](https://github.com/pypeclub/pype/pull/738) +- Maya: vray proxy was not loading [\#722](https://github.com/pypeclub/pype/pull/722) +- Maya: Vray expected file fixes [\#682](https://github.com/pypeclub/pype/pull/682) +- Missing audio on farm submission. [\#639](https://github.com/pypeclub/pype/pull/639) + +**Deprecated:** + +- Removed artist view from pyblish gui [\#717](https://github.com/pypeclub/pype/pull/717) +- Maya: disable legacy override check for cameras [\#715](https://github.com/pypeclub/pype/pull/715) + +**Merged pull requests:** + +- Application manager [\#728](https://github.com/pypeclub/pype/pull/728) +- Feature \#664 3.0 lib refactor [\#706](https://github.com/pypeclub/pype/pull/706) +- Lib from illicit part 2 [\#700](https://github.com/pypeclub/pype/pull/700) +- 3.0 lib refactor - path tools [\#697](https://github.com/pypeclub/pype/pull/697) + +## [2.13.7](https://github.com/pypeclub/pype/tree/2.13.7) (2020-11-19) + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.13.6...2.13.7) + +**Fixed bugs:** + +- Standalone Publisher: getting fps from context instead of nonexistent entity [\#729](https://github.com/pypeclub/pype/pull/729) + # Changelog ## [2.13.6](https://github.com/pypeclub/pype/tree/2.13.6) (2020-11-15) @@ -789,4 +1054,7 @@ A large cleanup release. Most of the change are under the hood. - _(avalon)_ subsets in maya 2019 weren't behaving correctly in the outliner +\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* + + \* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* diff --git a/README.md b/README.md index aae79f2358..73620d7885 100644 --- a/README.md +++ b/README.md @@ -166,14 +166,23 @@ sudo yum install qt5-qtbase-devel
Use pyenv to install Python version for OpenPype build -You will need **bzip2**, **readline** and **sqlite3** libraries. +You will need **bzip2**, **readline**, **sqlite3** and other libraries. -**Ubuntu:** +For more details about Python build environments see: + +https://github.com/pyenv/pyenv/wiki#suggested-build-environment + +**For Ubuntu:** ```sh -sudo apt install libbz2-dev libreadline-dev libsqlite3-dev +sudo apt-get update; sudo apt-get install --no-install-recommends make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev ``` -1) install **pyenv** +**For Centos:** +```sh +yum install gcc zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel openssl-devel tk-devel libffi-devel +``` + +**install pyenv** ```sh curl https://pyenv.run | bash diff --git a/igniter/__init__.py b/igniter/__init__.py index 6f9757cfc8..c2442ad57f 100644 --- a/igniter/__init__.py +++ b/igniter/__init__.py @@ -1,15 +1,11 @@ # -*- coding: utf-8 -*- """Open install dialog.""" +import os import sys -import os os.chdir(os.path.dirname(__file__)) # for override sys.path in Deadline -from Qt import QtWidgets # noqa -from Qt.QtCore import Signal # noqa - -from .install_dialog import InstallDialog from .bootstrap_repos import BootstrapRepos from .version import __version__ as version @@ -25,16 +21,21 @@ def get_result(res: int): def open_dialog(): """Show Igniter dialog.""" + from Qt import QtWidgets + from .install_dialog import InstallDialog + app = QtWidgets.QApplication(sys.argv) + d = InstallDialog() d.finished.connect(get_result) d.open() + app.exec() + return RESULT __all__ = [ - "InstallDialog", "BootstrapRepos", "open_dialog", "version" diff --git a/igniter/bootstrap_repos.py b/igniter/bootstrap_repos.py index 2f305e24e3..f624b96125 100644 --- a/igniter/bootstrap_repos.py +++ b/igniter/bootstrap_repos.py @@ -14,7 +14,10 @@ from zipfile import ZipFile, BadZipFile from appdirs import user_data_dir from speedcopy import copyfile -from .user_settings import OpenPypeSettingsRegistry +from .user_settings import ( + OpenPypeSecureRegistry, + OpenPypeSettingsRegistry +) from .tools import get_openpype_path_from_db @@ -239,6 +242,7 @@ class BootstrapRepos: self._app = "openpype" self._log = log.getLogger(str(__class__)) self.data_dir = Path(user_data_dir(self._app, self._vendor)) + self.secure_registry = OpenPypeSecureRegistry("mongodb") self.registry = OpenPypeSettingsRegistry() self.zip_filter = [".pyc", "__pycache__"] self.openpype_filter = [ diff --git a/igniter/install_dialog.py b/igniter/install_dialog.py index 2cc0ed8448..27b2d1fe37 100644 --- a/igniter/install_dialog.py +++ b/igniter/install_dialog.py @@ -13,7 +13,7 @@ from .tools import ( validate_mongo_connection, get_openpype_path_from_db ) -from .user_settings import OpenPypeSettingsRegistry +from .user_settings import OpenPypeSecureRegistry from .version import __version__ @@ -42,13 +42,13 @@ class InstallDialog(QtWidgets.QDialog): def __init__(self, parent=None): super(InstallDialog, self).__init__(parent) - self.registry = OpenPypeSettingsRegistry() + self.secure_registry = OpenPypeSecureRegistry("mongodb") self.mongo_url = "" try: self.mongo_url = ( os.getenv("OPENPYPE_MONGO", "") - or self.registry.get_secure_item("openPypeMongo") + or self.secure_registry.get_item("openPypeMongo") ) except ValueError: pass diff --git a/igniter/install_thread.py b/igniter/install_thread.py index bf5d541056..df8b830209 100644 --- a/igniter/install_thread.py +++ b/igniter/install_thread.py @@ -71,7 +71,7 @@ class InstallThread(QThread): if not os.getenv("OPENPYPE_MONGO"): # try to get it from settings registry try: - self._mongo = bs.registry.get_secure_item( + self._mongo = bs.secure_registry.get_item( "openPypeMongo") except ValueError: self.message.emit( @@ -82,7 +82,7 @@ class InstallThread(QThread): self._mongo = os.getenv("OPENPYPE_MONGO") else: self.message.emit("Saving mongo connection string ...", False) - bs.registry.set_secure_item("openPypeMongo", self._mongo) + bs.secure_registry.set_item("openPypeMongo", self._mongo) os.environ["OPENPYPE_MONGO"] = self._mongo @@ -169,7 +169,7 @@ class InstallThread(QThread): f"!!! invalid mongo url {self._mongo}", True) self.finished.emit(InstallResult(-1)) return - bs.registry.set_secure_item("openPypeMongo", self._mongo) + bs.secure_registry.set_item("openPypeMongo", self._mongo) os.environ["OPENPYPE_MONGO"] = self._mongo self.message.emit(f"processing {self._path}", True) diff --git a/igniter/user_settings.py b/igniter/user_settings.py index 77fb8b5ae5..2a406f83dd 100644 --- a/igniter/user_settings.py +++ b/igniter/user_settings.py @@ -25,8 +25,112 @@ except ImportError: import platform -import appdirs import six +import appdirs + +_PLACEHOLDER = object() + + +class OpenPypeSecureRegistry: + """Store information using keyring. + + Registry should be used for private data that should be available only for + user. + + All passed registry names will have added prefix `OpenPype/` to easier + identify which data were created by OpenPype. + + Args: + name(str): Name of registry used as identifier for data. + """ + def __init__(self, name): + try: + import keyring + + except Exception: + raise NotImplementedError( + "Python module `keyring` is not available." + ) + + # hack for cx_freeze and Windows keyring backend + if platform.system().lower() == "windows": + from keyring.backends import Windows + + keyring.set_keyring(Windows.WinVaultKeyring()) + + # Force "OpenPype" prefix + self._name = "/".join(("OpenPype", name)) + + def set_item(self, name, value): + # type: (str, str) -> None + """Set sensitive item into system's keyring. + + This uses `Keyring module`_ to save sensitive stuff into system's + keyring. + + Args: + name (str): Name of the item. + value (str): Value of the item. + + .. _Keyring module: + https://github.com/jaraco/keyring + + """ + import keyring + + keyring.set_password(self._name, name, value) + + @lru_cache(maxsize=32) + def get_item(self, name, default=_PLACEHOLDER): + """Get value of sensitive item from system's keyring. + + See also `Keyring module`_ + + Args: + name (str): Name of the item. + default (Any): Default value if item is not available. + + Returns: + value (str): Value of the item. + + Raises: + ValueError: If item doesn't exist and default is not defined. + + .. _Keyring module: + https://github.com/jaraco/keyring + + """ + import keyring + + value = keyring.get_password(self._name, name) + if value: + return value + + if default is not _PLACEHOLDER: + return default + + # NOTE Should raise `KeyError` + raise ValueError( + "Item {}:{} does not exist in keyring.".format(self._name, name) + ) + + def delete_item(self, name): + # type: (str) -> None + """Delete value stored in system's keyring. + + See also `Keyring module`_ + + Args: + name (str): Name of the item to be deleted. + + .. _Keyring module: + https://github.com/jaraco/keyring + + """ + import keyring + + self.get_item.cache_clear() + keyring.delete_password(self._name, name) @six.add_metaclass(ABCMeta) @@ -46,13 +150,6 @@ class ASettingRegistry(): # type: (str) -> ASettingRegistry super(ASettingRegistry, self).__init__() - if six.PY3: - import keyring - # hack for cx_freeze and Windows keyring backend - if platform.system() == "Windows": - from keyring.backends import Windows - keyring.set_keyring(Windows.WinVaultKeyring()) - self._name = name self._items = {} @@ -127,78 +224,6 @@ class ASettingRegistry(): del self._items[name] self._delete_item(name) - def set_secure_item(self, name, value): - # type: (str, str) -> None - """Set sensitive item into system's keyring. - - This uses `Keyring module`_ to save sensitive stuff into system's - keyring. - - Args: - name (str): Name of the item. - value (str): Value of the item. - - .. _Keyring module: - https://github.com/jaraco/keyring - - """ - if six.PY2: - raise NotImplementedError( - "Keyring not available on Python 2 hosts") - import keyring - keyring.set_password(self._name, name, value) - - @lru_cache(maxsize=32) - def get_secure_item(self, name): - # type: (str) -> str - """Get value of sensitive item from system's keyring. - - See also `Keyring module`_ - - Args: - name (str): Name of the item. - - Returns: - value (str): Value of the item. - - Raises: - ValueError: If item doesn't exist. - - .. _Keyring module: - https://github.com/jaraco/keyring - - """ - if six.PY2: - raise NotImplementedError( - "Keyring not available on Python 2 hosts") - import keyring - value = keyring.get_password(self._name, name) - if not value: - raise ValueError( - "Item {}:{} does not exist in keyring.".format( - self._name, name)) - return value - - def delete_secure_item(self, name): - # type: (str) -> None - """Delete value stored in system's keyring. - - See also `Keyring module`_ - - Args: - name (str): Name of the item to be deleted. - - .. _Keyring module: - https://github.com/jaraco/keyring - - """ - if six.PY2: - raise NotImplementedError( - "Keyring not available on Python 2 hosts") - import keyring - self.get_secure_item.cache_clear() - keyring.delete_password(self._name, name) - class IniSettingRegistry(ASettingRegistry): """Class using :mod:`configparser`. @@ -459,9 +484,10 @@ class OpenPypeSettingsRegistry(JSONSettingRegistry): """ - def __init__(self): + def __init__(self, name=None): self.vendor = "pypeclub" self.product = "openpype" + if not name: + name = "openpype_settings" path = appdirs.user_data_dir(self.product, self.vendor) - super(OpenPypeSettingsRegistry, self).__init__( - "openpype_settings", path) + super(OpenPypeSettingsRegistry, self).__init__(name, path) diff --git a/openpype/hooks/pre_python2_vendor.py b/openpype/hooks/pre_python2_vendor.py index 7aaf713dec..35f5ff1a45 100644 --- a/openpype/hooks/pre_python2_vendor.py +++ b/openpype/hooks/pre_python2_vendor.py @@ -6,12 +6,12 @@ class PrePython2Vendor(PreLaunchHook): """Prepend python 2 dependencies for py2 hosts.""" # WARNING This hook will probably be deprecated in OpenPype 3 - kept for test order = 10 - app_groups = ["hiero", "nuke", "nukex"] + app_groups = ["hiero", "nuke", "nukex", "unreal"] def execute(self): # Prepare vendor dir path self.log.info("adding global python 2 vendor") - pype_root = os.getenv("OPENPYPE_ROOT") + pype_root = os.getenv("OPENPYPE_REPOS_ROOT") python_2_vendor = os.path.join( pype_root, "openpype", diff --git a/openpype/hooks/pre_with_windows_shell.py b/openpype/hooks/pre_with_windows_shell.py index 5f0f03f13e..0c10583b99 100644 --- a/openpype/hooks/pre_with_windows_shell.py +++ b/openpype/hooks/pre_with_windows_shell.py @@ -1,4 +1,5 @@ import os +import subprocess from openpype.lib import PreLaunchHook @@ -10,15 +11,32 @@ class LaunchWithWindowsShell(PreLaunchHook): instead. """ - order = 10 - app_groups = ["resolve", "nuke", "nukex", "hiero", "nukestudio"] + # Should be as last hook becuase must change launch arguments to string + order = 1000 + app_groups = ["nuke", "nukex", "hiero", "nukestudio"] platforms = ["windows"] def execute(self): - # Get comspec which is cmd.exe in most cases. - comspec = os.environ.get("COMSPEC", "cmd.exe") - # Add comspec to arguments list and add "/k" - new_args = [comspec, "/c"] - new_args.extend(self.launch_context.launch_args) + new_args = [ + # Get comspec which is cmd.exe in most cases. + os.environ.get("COMSPEC", "cmd.exe"), + # NOTE change to "/k" if want to keep console opened + "/c", + # Convert arguments to command line arguments (as string) + "\"{}\"".format( + subprocess.list2cmdline(self.launch_context.launch_args) + ) + ] + # Convert list to string + # WARNING this only works if is used as string + args_string = " ".join(new_args) + self.log.info(( + "Modified launch arguments to be launched with shell \"{}\"." + ).format(args_string)) + # Replace launch args with new one - self.launch_context.launch_args = new_args + self.launch_context.launch_args = args_string + # Change `creationflags` to CREATE_NEW_CONSOLE + self.launch_context.kwargs["creationflags"] = ( + subprocess.CREATE_NEW_CONSOLE + ) diff --git a/openpype/hosts/aftereffects/api/__init__.py b/openpype/hosts/aftereffects/api/__init__.py index ee73a0f52b..9a80801652 100644 --- a/openpype/hosts/aftereffects/api/__init__.py +++ b/openpype/hosts/aftereffects/api/__init__.py @@ -10,7 +10,7 @@ import pyblish.api as pyblish import openpype.hosts.aftereffects -log = logging.getLogger("pype.hosts.aftereffects") +log = logging.getLogger("openpype.hosts.aftereffects") HOST_DIR = os.path.dirname(os.path.abspath(openpype.hosts.aftereffects.__file__)) diff --git a/openpype/hosts/aftereffects/plugins/publish/collect_render.py b/openpype/hosts/aftereffects/plugins/publish/collect_render.py index 4a124991fd..ba64551283 100644 --- a/openpype/hosts/aftereffects/plugins/publish/collect_render.py +++ b/openpype/hosts/aftereffects/plugins/publish/collect_render.py @@ -46,6 +46,12 @@ class CollectAERender(abstract_collect_render.AbstractCollectRender): "Please recreate instance.") item_id = inst["members"][0] work_area_info = self.stub.get_work_area(int(item_id)) + + if not work_area_info: + self.log.warning("Orphaned instance, deleting metadata") + self.stub.remove_instance(int(item_id)) + continue + frameStart = work_area_info.workAreaStart frameEnd = round(work_area_info.workAreaStart + diff --git a/openpype/hosts/aftereffects/plugins/publish/remove_publish_highlight.py b/openpype/hosts/aftereffects/plugins/publish/remove_publish_highlight.py index 291f22e3b8..d2b3fd1b12 100644 --- a/openpype/hosts/aftereffects/plugins/publish/remove_publish_highlight.py +++ b/openpype/hosts/aftereffects/plugins/publish/remove_publish_highlight.py @@ -21,3 +21,4 @@ class RemovePublishHighlight(openpype.api.Extractor): item = instance.data comp_name = item["comp_name"].replace(stub.PUBLISH_ICON, '') stub.rename_item(item["comp_id"], comp_name) + instance.data["comp_name"] = comp_name diff --git a/openpype/hosts/blender/api/__init__.py b/openpype/hosts/blender/api/__init__.py index 55c5b63f60..66102a2ae1 100644 --- a/openpype/hosts/blender/api/__init__.py +++ b/openpype/hosts/blender/api/__init__.py @@ -51,8 +51,37 @@ def set_start_end_frames(): "name": asset_name }) - bpy.context.scene.frame_start = asset_doc["data"]["frameStart"] - bpy.context.scene.frame_end = asset_doc["data"]["frameEnd"] + scene = bpy.context.scene + + # Default scene settings + frameStart = scene.frame_start + frameEnd = scene.frame_end + fps = scene.render.fps + resolution_x = scene.render.resolution_x + resolution_y = scene.render.resolution_y + + # Check if settings are set + data = asset_doc.get("data") + + if not data: + return + + if data.get("frameStart"): + frameStart = data.get("frameStart") + if data.get("frameEnd"): + frameEnd = data.get("frameEnd") + if data.get("fps"): + fps = data.get("fps") + if data.get("resolutionWidth"): + resolution_x = data.get("resolutionWidth") + if data.get("resolutionHeight"): + resolution_y = data.get("resolutionHeight") + + scene.frame_start = frameStart + scene.frame_end = frameEnd + scene.render.fps = fps + scene.render.resolution_x = resolution_x + scene.render.resolution_y = resolution_y def on_new(arg1, arg2): diff --git a/openpype/hosts/blender/plugins/load/load_layout.py b/openpype/hosts/blender/plugins/load/load_layout.py index 73b12d8c25..f1f2fdcddd 100644 --- a/openpype/hosts/blender/plugins/load/load_layout.py +++ b/openpype/hosts/blender/plugins/load/load_layout.py @@ -292,6 +292,9 @@ class UnrealLayoutLoader(plugin.AssetLoader): icon = "code-fork" color = "orange" + animation_creator_name = "CreateAnimation" + setdress_creator_name = "CreateSetDress" + def _remove_objects(self, objects): for obj in list(objects): if obj.type == 'ARMATURE': @@ -368,7 +371,7 @@ class UnrealLayoutLoader(plugin.AssetLoader): location.get('z') ) obj.rotation_euler = ( - rotation.get('x'), + rotation.get('x') + math.pi / 2, -rotation.get('y'), -rotation.get('z') ) diff --git a/openpype/hosts/blender/plugins/publish/validate_object_mode.py b/openpype/hosts/blender/plugins/publish/validate_object_mode.py new file mode 100644 index 0000000000..1c82628c1c --- /dev/null +++ b/openpype/hosts/blender/plugins/publish/validate_object_mode.py @@ -0,0 +1,35 @@ +from typing import List + +import pyblish.api +import openpype.hosts.blender.api.action + + +class ValidateObjectIsInObjectMode(pyblish.api.InstancePlugin): + """Validate that the current object is in Object Mode.""" + + order = pyblish.api.ValidatorOrder - 0.01 + hosts = ["blender"] + families = ["model", "rig"] + category = "geometry" + label = "Object is in Object Mode" + actions = [openpype.hosts.blender.api.action.SelectInvalidAction] + optional = True + + @classmethod + def get_invalid(cls, instance) -> List: + invalid = [] + for obj in [obj for obj in instance]: + try: + if obj.type == 'MESH' or obj.type == 'ARMATURE': + # Check if the object is in object mode. + if not obj.mode == 'OBJECT': + invalid.append(obj) + except Exception: + continue + return invalid + + def process(self, instance): + invalid = self.get_invalid(instance) + if invalid: + raise RuntimeError( + f"Object found in instance is not in Object Mode: {invalid}") diff --git a/openpype/hosts/celaction/api/cli.py b/openpype/hosts/celaction/api/cli.py index 5b30da7273..acd9da8229 100644 --- a/openpype/hosts/celaction/api/cli.py +++ b/openpype/hosts/celaction/api/cli.py @@ -62,7 +62,7 @@ def _prepare_publish_environments(): env["AVALON_TASK"] = os.getenv("AVALON_TASK") env["AVALON_WORKDIR"] = os.getenv("AVALON_WORKDIR") env["AVALON_APP"] = f"hosts.{publish_host}" - env["AVALON_APP_NAME"] = "celaction_local" + env["AVALON_APP_NAME"] = "celaction/local" env["PYBLISH_HOSTS"] = publish_host diff --git a/openpype/hosts/fusion/api/pipeline.py b/openpype/hosts/fusion/api/pipeline.py index 4fec548993..0095530087 100644 --- a/openpype/hosts/fusion/api/pipeline.py +++ b/openpype/hosts/fusion/api/pipeline.py @@ -39,7 +39,7 @@ def install(): avalon.data["familiesStateDefault"] = False avalon.data["familiesStateToggled"] = family_states - log.info("pype.hosts.fusion installed") + log.info("openpype.hosts.fusion installed") pyblish.register_host("fusion") pyblish.register_plugin_path(PUBLISH_PATH) diff --git a/openpype/hosts/fusion/plugins/publish/collect_render_target.py b/openpype/hosts/fusion/plugins/publish/collect_render_target.py index 50cc4fd3e9..39017f32e0 100644 --- a/openpype/hosts/fusion/plugins/publish/collect_render_target.py +++ b/openpype/hosts/fusion/plugins/publish/collect_render_target.py @@ -13,7 +13,7 @@ class CollectFusionRenderMode(pyblish.api.InstancePlugin): available tool does not visualize which render mode is set for the current comp, please run the following line in the console (Py2) - comp.GetData("pype.rendermode") + comp.GetData("openpype.rendermode") This will return the name of the current render mode as seen above under Options. @@ -34,7 +34,7 @@ class CollectFusionRenderMode(pyblish.api.InstancePlugin): raise RuntimeError("No comp previously collected, unable to " "retrieve Fusion version.") - rendermode = comp.GetData("pype.rendermode") or "local" + rendermode = comp.GetData("openpype.rendermode") or "local" assert rendermode in options, "Must be supported render mode" self.log.info("Render mode: {0}".format(rendermode)) diff --git a/openpype/hosts/fusion/scripts/set_rendermode.py b/openpype/hosts/fusion/scripts/set_rendermode.py index cb0b9da513..cb104445a8 100644 --- a/openpype/hosts/fusion/scripts/set_rendermode.py +++ b/openpype/hosts/fusion/scripts/set_rendermode.py @@ -96,11 +96,11 @@ class SetRenderMode(QtWidgets.QWidget): return self._comp.GetAttrs("COMPS_Name") def _get_comp_rendermode(self): - return self._comp.GetData("pype.rendermode") or "local" + return self._comp.GetData("openpype.rendermode") or "local" def _set_comp_rendermode(self): rendermode = self.mode_options.currentText() - self._comp.SetData("pype.rendermode", rendermode) + self._comp.SetData("openpype.rendermode", rendermode) self._comp.Print("Updated render mode to '%s'\n" % rendermode) self.hide() diff --git a/openpype/hosts/hiero/startup/Python/Startup/Startup.py b/openpype/hosts/hiero/startup/Python/Startup/Startup.py index 8de2dc2d11..21c21cd7c3 100644 --- a/openpype/hosts/hiero/startup/Python/Startup/Startup.py +++ b/openpype/hosts/hiero/startup/Python/Startup/Startup.py @@ -6,7 +6,7 @@ import openpype.hosts.hiero.api as phiero avalon.api.install(phiero) try: - __import__("pype.hosts.hiero.api") + __import__("openpype.hosts.hiero.api") __import__("pyblish") except ImportError as e: diff --git a/openpype/hosts/maya/plugins/create/create_look.py b/openpype/hosts/maya/plugins/create/create_look.py index 7f443eaf91..36a3120a9a 100644 --- a/openpype/hosts/maya/plugins/create/create_look.py +++ b/openpype/hosts/maya/plugins/create/create_look.py @@ -12,7 +12,7 @@ class CreateLook(plugin.Creator): family = "look" icon = "paint-brush" defaults = ['Main'] - make_txt = True + make_tx = True def __init__(self, *args, **kwargs): super(CreateLook, self).__init__(*args, **kwargs) diff --git a/openpype/hosts/nuke/api/__init__.py b/openpype/hosts/nuke/api/__init__.py index 25504aa12b..c80507e7ea 100644 --- a/openpype/hosts/nuke/api/__init__.py +++ b/openpype/hosts/nuke/api/__init__.py @@ -1,18 +1,12 @@ import os -import sys import nuke -from avalon import api as avalon -from openpype.tools import workfiles -from pyblish import api as pyblish -from openpype.api import Logger -import openpype.hosts.nuke +import avalon.api +import pyblish.api +import openpype from . import lib, menu - -self = sys.modules[__name__] -self.workfiles_launched = False -log = Logger().get_logger(__name__) +log = openpype.api.Logger().get_logger(__name__) AVALON_CONFIG = os.getenv("AVALON_CONFIG", "pype") HOST_DIR = os.path.dirname(os.path.abspath(openpype.hosts.nuke.__file__)) @@ -25,7 +19,7 @@ INVENTORY_PATH = os.path.join(PLUGINS_DIR, "inventory") # registering pyblish gui regarding settings in presets if os.getenv("PYBLISH_GUI", None): - pyblish.register_gui(os.getenv("PYBLISH_GUI", None)) + pyblish.api.register_gui(os.getenv("PYBLISH_GUI", None)) def reload_config(): @@ -61,15 +55,16 @@ def install(): ''' log.info("Registering Nuke plug-ins..") - pyblish.register_plugin_path(PUBLISH_PATH) - avalon.register_plugin_path(avalon.Loader, LOAD_PATH) - avalon.register_plugin_path(avalon.Creator, CREATE_PATH) - avalon.register_plugin_path(avalon.InventoryAction, INVENTORY_PATH) + pyblish.api.register_plugin_path(PUBLISH_PATH) + avalon.api.register_plugin_path(avalon.api.Loader, LOAD_PATH) + avalon.api.register_plugin_path(avalon.api.Creator, CREATE_PATH) + avalon.api.register_plugin_path(avalon.api.InventoryAction, INVENTORY_PATH) # Register Avalon event for workfiles loading. - avalon.on("workio.open_file", lib.check_inventory_versions) + avalon.api.on("workio.open_file", lib.check_inventory_versions) - pyblish.register_callback("instanceToggled", on_pyblish_instance_toggled) + pyblish.api.register_callback( + "instanceToggled", on_pyblish_instance_toggled) workfile_settings = lib.WorkfileSettings() # Disable all families except for the ones we explicitly want to see family_states = [ @@ -79,39 +74,27 @@ def install(): "gizmo" ] - avalon.data["familiesStateDefault"] = False - avalon.data["familiesStateToggled"] = family_states - - # Workfiles. - launch_workfiles = os.environ.get("WORKFILES_STARTUP") - - if launch_workfiles: - nuke.addOnCreate(launch_workfiles_app, nodeClass="Root") + avalon.api.data["familiesStateDefault"] = False + avalon.api.data["familiesStateToggled"] = family_states # Set context settings. nuke.addOnCreate(workfile_settings.set_context_settings, nodeClass="Root") - # nuke.addOnCreate(workfile_settings.set_favorites, nodeClass="Root") - + nuke.addOnCreate(workfile_settings.set_favorites, nodeClass="Root") + nuke.addOnCreate(lib.open_last_workfile, nodeClass="Root") + nuke.addOnCreate(lib.launch_workfiles_app, nodeClass="Root") menu.install() -def launch_workfiles_app(): - '''Function letting start workfiles after start of host - ''' - if not self.workfiles_launched: - self.workfiles_launched = True - workfiles.show(os.environ["AVALON_WORKDIR"]) - - def uninstall(): '''Uninstalling host's integration ''' log.info("Deregistering Nuke plug-ins..") - pyblish.deregister_plugin_path(PUBLISH_PATH) - avalon.deregister_plugin_path(avalon.Loader, LOAD_PATH) - avalon.deregister_plugin_path(avalon.Creator, CREATE_PATH) + pyblish.api.deregister_plugin_path(PUBLISH_PATH) + avalon.api.deregister_plugin_path(avalon.api.Loader, LOAD_PATH) + avalon.api.deregister_plugin_path(avalon.api.Creator, CREATE_PATH) - pyblish.deregister_callback("instanceToggled", on_pyblish_instance_toggled) + pyblish.api.deregister_callback( + "instanceToggled", on_pyblish_instance_toggled) reload_config() menu.uninstall() @@ -123,7 +106,7 @@ def on_pyblish_instance_toggled(instance, old_value, new_value): log.info("instance toggle: {}, old_value: {}, new_value:{} ".format( instance, old_value, new_value)) - from avalon.nuke import ( + from avalon.api.nuke import ( viewer_update_and_undo_stop, add_publish_knob ) diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py index 8618b03cdc..d95af6ec4c 100644 --- a/openpype/hosts/nuke/api/lib.py +++ b/openpype/hosts/nuke/api/lib.py @@ -3,9 +3,14 @@ import re import sys from collections import OrderedDict + from avalon import api, io, lib +from avalon.tools import workfiles import avalon.nuke from avalon.nuke import lib as anlib +from avalon.nuke import ( + save_file, open_file +) from openpype.api import ( Logger, Anatomy, @@ -13,6 +18,7 @@ from openpype.api import ( get_anatomy_settings, get_hierarchy, get_asset, + get_current_project_settings, config, ApplicationManager ) @@ -25,8 +31,10 @@ log = Logger().get_logger(__name__) self = sys.modules[__name__] self._project = None +self.workfiles_launched = False self._node_tab_name = "{}".format(os.getenv("AVALON_LABEL") or "Avalon") + def get_node_imageio_setting(**kwarg): ''' Get preset data for dataflow (fileType, compression, bitDepth) ''' @@ -1616,3 +1624,41 @@ def find_free_space_to_paste_nodes( xpos = min(group_xpos) ypos = max(group_ypos) + abs(offset) return xpos, ypos + + +def launch_workfiles_app(): + '''Function letting start workfiles after start of host + ''' + # get state from settings + open_at_start = get_current_project_settings()["nuke"].get( + "general", {}).get("open_workfile_at_start") + + # return if none is defined + if not open_at_start: + return + + if not self.workfiles_launched: + self.workfiles_launched = True + workfiles.show(os.environ["AVALON_WORKDIR"]) + + +def open_last_workfile(): + # get state from settings + open_last_version = get_current_project_settings()["nuke"].get( + "general", {}).get("create_initial_workfile") + + log.info("Opening last workfile...") + last_workfile_path = os.environ.get("AVALON_LAST_WORKFILE") + + if not os.path.exists(last_workfile_path): + # return if none is defined + if not open_last_version: + return + + save_file(last_workfile_path) + else: + # to avoid looping of the callback, remove it! + nuke.removeOnCreate(open_last_workfile, nodeClass="Root") + + # open workfile + open_file(last_workfile_path) diff --git a/openpype/hosts/nuke/plugins/publish/precollect_instances.py b/openpype/hosts/nuke/plugins/publish/precollect_instances.py index 2d25b29826..92f96ea48d 100644 --- a/openpype/hosts/nuke/plugins/publish/precollect_instances.py +++ b/openpype/hosts/nuke/plugins/publish/precollect_instances.py @@ -80,25 +80,31 @@ class PreCollectNukeInstances(pyblish.api.ContextPlugin): # Add all nodes in group instances. if node.Class() == "Group": - # check if it is write node in family - if "write" in families: + # only alter families for render family + if "write" in families_ak: target = node["render"].value() if target == "Use existing frames": # Local rendering self.log.info("flagged for no render") - families.append("render") + families.append(family) elif target == "Local": # Local rendering self.log.info("flagged for local render") - families.append("{}.local".format("render")) + families.append("{}.local".format(family)) elif target == "On farm": # Farm rendering self.log.info("flagged for farm render") instance.data["transfer"] = False - families.append("{}.farm".format("render")) + families.append("{}.farm".format(family)) + + # suffle family to `write` as it is main family + # this will be changed later on in process if "render" in families: families.remove("render") family = "write" + elif "prerender" in families: + families.remove("prerender") + family = "write" node.begin() for i in nuke.allNodes(): diff --git a/openpype/hosts/nuke/plugins/publish/precollect_writes.py b/openpype/hosts/nuke/plugins/publish/precollect_writes.py index a519609f52..57303bd42e 100644 --- a/openpype/hosts/nuke/plugins/publish/precollect_writes.py +++ b/openpype/hosts/nuke/plugins/publish/precollect_writes.py @@ -108,6 +108,8 @@ class CollectNukeWrites(pyblish.api.InstancePlugin): # Add version data to instance version_data = { + "families": [f.replace(".local", "").replace(".farm", "") + for f in families if "write" not in f], "colorspace": node["colorspace"].value(), } diff --git a/openpype/hosts/photoshop/api/__init__.py b/openpype/hosts/photoshop/api/__init__.py index 7304574ffd..81942c3b2a 100644 --- a/openpype/hosts/photoshop/api/__init__.py +++ b/openpype/hosts/photoshop/api/__init__.py @@ -9,7 +9,7 @@ from openpype import lib from pyblish import api as pyblish import openpype.hosts.photoshop -log = logging.getLogger("pype.hosts.photoshop") +log = logging.getLogger("openpype.hosts.photoshop") HOST_DIR = os.path.dirname(os.path.abspath(openpype.hosts.photoshop.__file__)) PLUGINS_DIR = os.path.join(HOST_DIR, "plugins") diff --git a/openpype/hosts/resolve/__init__.py b/openpype/hosts/resolve/__init__.py index 734e0bc5df..3e49ce3b9b 100644 --- a/openpype/hosts/resolve/__init__.py +++ b/openpype/hosts/resolve/__init__.py @@ -11,7 +11,9 @@ from .api.pipeline import ( update_container, publish, launch_workfiles_app, - maintained_selection + maintained_selection, + remove_instance, + list_instances ) from .api.lib import ( @@ -73,6 +75,8 @@ __all__ = [ "publish", "launch_workfiles_app", "maintained_selection", + "remove_instance", + "list_instances", # utils "setup", diff --git a/openpype/hosts/resolve/api/menu.py b/openpype/hosts/resolve/api/menu.py index 5ed7aeab34..e7be3fc963 100644 --- a/openpype/hosts/resolve/api/menu.py +++ b/openpype/hosts/resolve/api/menu.py @@ -12,7 +12,8 @@ from avalon.tools import ( creator, loader, sceneinventory, - libraryloader + libraryloader, + subsetmanager ) @@ -64,8 +65,9 @@ class OpenPypeMenu(QtWidgets.QWidget): publish_btn = QtWidgets.QPushButton("Publish ...", self) load_btn = QtWidgets.QPushButton("Load ...", self) inventory_btn = QtWidgets.QPushButton("Inventory ...", self) + subsetm_btn = QtWidgets.QPushButton("Subset Manager ...", self) libload_btn = QtWidgets.QPushButton("Library ...", self) - # rename_btn = QtWidgets.QPushButton("Rename ...", self) + # rename_btn = QtWidgets.QPushButton("Rename", self) # set_colorspace_btn = QtWidgets.QPushButton( # "Set colorspace from presets", self # ) @@ -81,6 +83,7 @@ class OpenPypeMenu(QtWidgets.QWidget): layout.addWidget(publish_btn) layout.addWidget(load_btn) layout.addWidget(inventory_btn) + layout.addWidget(subsetm_btn) layout.addWidget(Spacer(15, self)) @@ -102,6 +105,7 @@ class OpenPypeMenu(QtWidgets.QWidget): publish_btn.clicked.connect(self.on_publish_clicked) load_btn.clicked.connect(self.on_load_clicked) inventory_btn.clicked.connect(self.on_inventory_clicked) + subsetm_btn.clicked.connect(self.on_subsetm_clicked) libload_btn.clicked.connect(self.on_libload_clicked) # rename_btn.clicked.connect(self.on_rename_clicked) # set_colorspace_btn.clicked.connect(self.on_set_colorspace_clicked) @@ -127,6 +131,10 @@ class OpenPypeMenu(QtWidgets.QWidget): print("Clicked Inventory") sceneinventory.show() + def on_subsetm_clicked(self): + print("Clicked Subset Manager") + subsetmanager.show() + def on_libload_clicked(self): print("Clicked Library") libraryloader.show() diff --git a/openpype/hosts/resolve/api/pipeline.py b/openpype/hosts/resolve/api/pipeline.py index d4d928a7d9..a659ac7e51 100644 --- a/openpype/hosts/resolve/api/pipeline.py +++ b/openpype/hosts/resolve/api/pipeline.py @@ -47,7 +47,7 @@ def install(): avalon.data["familiesStateDefault"] = False avalon.data["familiesStateToggled"] = family_states - log.info("pype.hosts.resolve installed") + log.info("openpype.hosts.resolve installed") pyblish.register_host("resolve") pyblish.register_plugin_path(PUBLISH_PATH) @@ -258,3 +258,51 @@ def on_pyblish_instance_toggled(instance, old_value, new_value): # Whether instances should be passthrough based on new value timeline_item = instance.data["item"] set_publish_attribute(timeline_item, new_value) + + +def remove_instance(instance): + """Remove instance marker from track item.""" + instance_id = instance.get("uuid") + + selected_timeline_items = lib.get_current_timeline_items( + filter=True, selecting_color=lib.publish_clip_color) + + found_ti = None + for timeline_item_data in selected_timeline_items: + timeline_item = timeline_item_data["clip"]["item"] + + # get openpype tag data + tag_data = lib.get_timeline_item_pype_tag(timeline_item) + _ti_id = tag_data.get("uuid") + if _ti_id == instance_id: + found_ti = timeline_item + break + + if found_ti is None: + return + + # removing instance by marker color + print(f"Removing instance: {found_ti.GetName()}") + found_ti.DeleteMarkersByColor(lib.pype_marker_color) + + +def list_instances(): + """List all created instances from current workfile.""" + listed_instances = [] + selected_timeline_items = lib.get_current_timeline_items( + filter=True, selecting_color=lib.publish_clip_color) + + for timeline_item_data in selected_timeline_items: + timeline_item = timeline_item_data["clip"]["item"] + ti_name = timeline_item.GetName().split(".")[0] + + # get openpype tag data + tag_data = lib.get_timeline_item_pype_tag(timeline_item) + + if tag_data: + asset = tag_data.get("asset") + subset = tag_data.get("subset") + tag_data["label"] = f"{ti_name} [{asset}-{subset}]" + listed_instances.append(tag_data) + + return listed_instances diff --git a/openpype/hosts/resolve/api/plugin.py b/openpype/hosts/resolve/api/plugin.py index 3833795b96..4712d0a8b9 100644 --- a/openpype/hosts/resolve/api/plugin.py +++ b/openpype/hosts/resolve/api/plugin.py @@ -1,4 +1,5 @@ import re +import uuid from avalon import api import openpype.api as pype from openpype.hosts import resolve @@ -697,13 +698,13 @@ class PublishClip: Populating the tag data into internal variable self.tag_data """ # define vertical sync attributes - master_layer = True + hero_track = True self.review_layer = "" if self.vertical_sync: # check if track name is not in driving layer if self.track_name not in self.driving_layer: # if it is not then define vertical sync as None - master_layer = False + hero_track = False # increasing steps by index of rename iteration self.count_steps *= self.rename_index @@ -717,7 +718,7 @@ class PublishClip: self.tag_data[_k] = _v["value"] # driving layer is set as positive match - if master_layer or self.vertical_sync: + if hero_track or self.vertical_sync: # mark review layer if self.review_track and ( self.review_track not in self.review_track_default): @@ -751,35 +752,39 @@ class PublishClip: hierarchy_formating_data ) - tag_hierarchy_data.update({"masterLayer": True}) - if master_layer and self.vertical_sync: - # tag_hierarchy_data.update({"masterLayer": True}) + tag_hierarchy_data.update({"heroTrack": True}) + if hero_track and self.vertical_sync: self.vertical_clip_match.update({ (self.clip_in, self.clip_out): tag_hierarchy_data }) - if not master_layer and self.vertical_sync: + if not hero_track and self.vertical_sync: # driving layer is set as negative match - for (_in, _out), master_data in self.vertical_clip_match.items(): - master_data.update({"masterLayer": False}) + for (_in, _out), hero_data in self.vertical_clip_match.items(): + hero_data.update({"heroTrack": False}) if _in == self.clip_in and _out == self.clip_out: - data_subset = master_data["subset"] - # add track index in case duplicity of names in master data + data_subset = hero_data["subset"] + # add track index in case duplicity of names in hero data if self.subset in data_subset: - master_data["subset"] = self.subset + str( + hero_data["subset"] = self.subset + str( self.track_index) # in case track name and subset name is the same then add if self.subset_name == self.track_name: - master_data["subset"] = self.subset + hero_data["subset"] = self.subset # assing data to return hierarchy data to tag - tag_hierarchy_data = master_data + tag_hierarchy_data = hero_data # add data to return data dict self.tag_data.update(tag_hierarchy_data) - if master_layer and self.review_layer: + # add uuid to tag data + self.tag_data["uuid"] = str(uuid.uuid4()) + + # add review track only to hero track + if hero_track and self.review_layer: self.tag_data.update({"reviewTrack": self.review_layer}) + def _solve_tag_hierarchy_data(self, hierarchy_formating_data): """ Solve tag data from hierarchy data and templates. """ # fill up clip name and hierarchy keys diff --git a/openpype/hosts/resolve/hooks/pre_resolve_setup.py b/openpype/hosts/resolve/hooks/pre_resolve_setup.py index 0ee55d3790..bcb27e24fc 100644 --- a/openpype/hosts/resolve/hooks/pre_resolve_setup.py +++ b/openpype/hosts/resolve/hooks/pre_resolve_setup.py @@ -44,7 +44,7 @@ class ResolvePrelaunch(PreLaunchHook): self.launch_context.env["PRE_PYTHON_SCRIPT"] = pre_py_sc self.log.debug(f"-- pre_py_sc: `{pre_py_sc}`...") try: - __import__("pype.hosts.resolve") + __import__("openpype.hosts.resolve") __import__("pyblish") except ImportError: diff --git a/openpype/hosts/resolve/plugins/create/create_shot_clip.py b/openpype/hosts/resolve/plugins/create/create_shot_clip.py index 2916a52298..41fdbf5c61 100644 --- a/openpype/hosts/resolve/plugins/create/create_shot_clip.py +++ b/openpype/hosts/resolve/plugins/create/create_shot_clip.py @@ -117,7 +117,7 @@ class CreateShotClip(resolve.Creator): "vSyncTrack": { "value": gui_tracks, # noqa "type": "QComboBox", - "label": "Master track", + "label": "Hero track", "target": "ui", "toolTip": "Select driving track name which should be mastering all others", # noqa "order": 1} diff --git a/openpype/hosts/resolve/plugins/publish/collect_instances.py b/openpype/hosts/resolve/plugins/publish/precollect_instances.py similarity index 95% rename from openpype/hosts/resolve/plugins/publish/collect_instances.py rename to openpype/hosts/resolve/plugins/publish/precollect_instances.py index f4eeb39754..c38cbc4f73 100644 --- a/openpype/hosts/resolve/plugins/publish/collect_instances.py +++ b/openpype/hosts/resolve/plugins/publish/precollect_instances.py @@ -5,11 +5,11 @@ from openpype.hosts import resolve from pprint import pformat -class CollectInstances(pyblish.api.ContextPlugin): +class PrecollectInstances(pyblish.api.ContextPlugin): """Collect all Track items selection.""" order = pyblish.api.CollectorOrder - 0.59 - label = "Collect Instances" + label = "Precollect Instances" hosts = ["resolve"] def process(self, context): @@ -26,7 +26,7 @@ class CollectInstances(pyblish.api.ContextPlugin): data = dict() timeline_item = timeline_item_data["clip"]["item"] - # get openpype tag data + # get pype tag data tag_data = resolve.get_timeline_item_pype_tag(timeline_item) self.log.debug(f"__ tag_data: {pformat(tag_data)}") @@ -102,10 +102,10 @@ class CollectInstances(pyblish.api.ContextPlugin): }) def create_shot_instance(self, context, timeline_item, **data): - master_layer = data.get("masterLayer") + hero_track = data.get("heroTrack") hierarchy_data = data.get("hierarchyData") - if not master_layer: + if not hero_track: return if not hierarchy_data: diff --git a/openpype/hosts/resolve/plugins/publish/collect_workfile.py b/openpype/hosts/resolve/plugins/publish/precollect_workfile.py similarity index 88% rename from openpype/hosts/resolve/plugins/publish/collect_workfile.py rename to openpype/hosts/resolve/plugins/publish/precollect_workfile.py index a66284ed02..ee05fb6f13 100644 --- a/openpype/hosts/resolve/plugins/publish/collect_workfile.py +++ b/openpype/hosts/resolve/plugins/publish/precollect_workfile.py @@ -9,10 +9,10 @@ from openpype.hosts.resolve.otio import davinci_export reload(davinci_export) -class CollectWorkfile(pyblish.api.ContextPlugin): - """Inject the current working file into context""" +class PrecollectWorkfile(pyblish.api.ContextPlugin): + """Precollect the current working file into context""" - label = "Collect Workfile" + label = "Precollect Workfile" order = pyblish.api.CollectorOrder - 0.6 def process(self, context): @@ -21,8 +21,6 @@ class CollectWorkfile(pyblish.api.ContextPlugin): subset = "workfile" project = resolve.get_current_project() fps = project.GetSetting("timelineFrameRate") - - active_timeline = resolve.get_current_timeline() video_tracks = resolve.get_video_track_names() # adding otio timeline to context diff --git a/openpype/hosts/resolve/utility_scripts/OTIO_export.py b/openpype/hosts/resolve/utility_scripts/OTIO_export.py index 91bc2c5700..0431eb7daa 100644 --- a/openpype/hosts/resolve/utility_scripts/OTIO_export.py +++ b/openpype/hosts/resolve/utility_scripts/OTIO_export.py @@ -58,9 +58,8 @@ def _close_window(event): def _export_button(event): pm = resolve.GetProjectManager() project = pm.GetCurrentProject() - fps = project.GetSetting("timelineFrameRate") timeline = project.GetCurrentTimeline() - otio_timeline = otio_export.create_otio_timeline(timeline, fps) + otio_timeline = otio_export.create_otio_timeline(project) otio_path = os.path.join( itm["exportfilebttn"].Text, timeline.GetName() + ".otio") diff --git a/openpype/hosts/tvpaint/api/__init__.py b/openpype/hosts/tvpaint/api/__init__.py index 068559049b..bd9ef51a76 100644 --- a/openpype/hosts/tvpaint/api/__init__.py +++ b/openpype/hosts/tvpaint/api/__init__.py @@ -1,14 +1,15 @@ import os import logging -from avalon.tvpaint.communication_server import register_localization_file -from avalon.tvpaint import pipeline import avalon.api import pyblish.api +from avalon.tvpaint import pipeline +from avalon.tvpaint.communication_server import register_localization_file +from .lib import set_context_settings from openpype.hosts import tvpaint -log = logging.getLogger("openpype.hosts.tvpaint") +log = logging.getLogger(__name__) HOST_DIR = os.path.dirname(os.path.abspath(tvpaint.__file__)) PLUGINS_DIR = os.path.join(HOST_DIR, "plugins") @@ -34,6 +35,18 @@ def on_instance_toggle(instance, old_value, new_value): pipeline._write_instances(current_instances) +def initial_launch(): + # Setup project settings if its the template that's launched. + # TODO also check for template creation when it's possible to define + # templates + last_workfile = os.environ.get("AVALON_LAST_WORKFILE") + if not last_workfile or os.path.exists(last_workfile): + return + + log.info("Setting up project...") + set_context_settings() + + def install(): log.info("OpenPype - Installing TVPaint integration") localization_file = os.path.join(HOST_DIR, "resources", "avalon.loc") @@ -49,6 +62,8 @@ def install(): if on_instance_toggle not in registered_callbacks: pyblish.api.register_callback("instanceToggled", on_instance_toggle) + avalon.api.on("application.launched", initial_launch) + def uninstall(): log.info("OpenPype - Uninstalling TVPaint integration") diff --git a/openpype/hosts/tvpaint/api/lib.py b/openpype/hosts/tvpaint/api/lib.py index 4267129fe6..cbc86f7b03 100644 --- a/openpype/hosts/tvpaint/api/lib.py +++ b/openpype/hosts/tvpaint/api/lib.py @@ -1,5 +1,8 @@ from PIL import Image +import avalon.io +from avalon.tvpaint.lib import execute_george + def composite_images(input_image_paths, output_filepath): """Composite images in order from passed list. @@ -18,3 +21,64 @@ def composite_images(input_image_paths, output_filepath): else: img_obj.alpha_composite(_img_obj) img_obj.save(output_filepath) + + +def set_context_settings(asset_doc=None): + """Set workfile settings by asset document data. + + Change fps, resolution and frame start/end. + """ + if asset_doc is None: + # Use current session asset if not passed + asset_doc = avalon.io.find_one({ + "type": "asset", + "name": avalon.io.Session["AVALON_ASSET"] + }) + + project_doc = avalon.io.find_one({"type": "project"}) + + framerate = asset_doc["data"].get("fps") + if framerate is None: + framerate = project_doc["data"].get("fps") + + if framerate is not None: + execute_george( + "tv_framerate {} \"timestretch\"".format(framerate) + ) + else: + print("Framerate was not found!") + + width_key = "resolutionWidth" + height_key = "resolutionHeight" + + width = asset_doc["data"].get(width_key) + height = asset_doc["data"].get(height_key) + if width is None or height is None: + width = project_doc["data"].get(width_key) + height = project_doc["data"].get(height_key) + + if width is None or height is None: + print("Resolution was not found!") + else: + execute_george("tv_resizepage {} {} 0".format(width, height)) + + frame_start = asset_doc["data"].get("frameStart") + frame_end = asset_doc["data"].get("frameEnd") + + if frame_start is None or frame_end is None: + print("Frame range was not found!") + return + + handles = asset_doc["data"].get("handles") or 0 + handle_start = asset_doc["data"].get("handleStart") + handle_end = asset_doc["data"].get("handleEnd") + + if handle_start is None or handle_end is None: + handle_start = handles + handle_end = handles + + frame_start -= int(handle_start) + frame_end += int(handle_end) + + execute_george("tv_markin {} set".format(frame_start - 1)) + execute_george("tv_markout {} set".format(frame_end - 1)) diff --git a/openpype/hosts/tvpaint/plugins/publish/collect_instances.py b/openpype/hosts/tvpaint/plugins/publish/collect_instances.py index 57602d9610..0808dc06b1 100644 --- a/openpype/hosts/tvpaint/plugins/publish/collect_instances.py +++ b/openpype/hosts/tvpaint/plugins/publish/collect_instances.py @@ -18,7 +18,7 @@ class CollectInstances(pyblish.api.ContextPlugin): )) for instance_data in workfile_instances: - instance_data["fps"] = context.data["fps"] + instance_data["fps"] = context.data["sceneFps"] # Store workfile instance data to instance data instance_data["originData"] = copy.deepcopy(instance_data) @@ -32,6 +32,11 @@ class CollectInstances(pyblish.api.ContextPlugin): subset_name = instance_data["subset"] name = instance_data.get("name", subset_name) instance_data["name"] = name + instance_data["label"] = "{} [{}-{}]".format( + name, + context.data["sceneMarkIn"] + 1, + context.data["sceneMarkOut"] + 1 + ) active = instance_data.get("active", True) instance_data["active"] = active @@ -73,8 +78,8 @@ class CollectInstances(pyblish.api.ContextPlugin): if instance is None: continue - instance.data["frameStart"] = context.data["frameStart"] - instance.data["frameEnd"] = context.data["frameEnd"] + instance.data["frameStart"] = context.data["sceneMarkIn"] + 1 + instance.data["frameEnd"] = context.data["sceneMarkOut"] + 1 self.log.debug("Created instance: {}\n{}".format( instance, json.dumps(instance.data, indent=4) diff --git a/openpype/hosts/tvpaint/plugins/publish/collect_workfile_data.py b/openpype/hosts/tvpaint/plugins/publish/collect_workfile_data.py index 7965112136..4409413ff6 100644 --- a/openpype/hosts/tvpaint/plugins/publish/collect_workfile_data.py +++ b/openpype/hosts/tvpaint/plugins/publish/collect_workfile_data.py @@ -122,36 +122,26 @@ class CollectWorkfileData(pyblish.api.ContextPlugin): width = int(workfile_info_parts.pop(-1)) workfile_path = " ".join(workfile_info_parts).replace("\"", "") - frame_start, frame_end = self.collect_clip_frames() + # Marks return as "{frame - 1} {state} ", example "0 set". + result = lib.execute_george("tv_markin") + mark_in_frame, mark_in_state, _ = result.split(" ") + + result = lib.execute_george("tv_markout") + mark_out_frame, mark_out_state, _ = result.split(" ") + scene_data = { "currentFile": workfile_path, "sceneWidth": width, "sceneHeight": height, - "pixelAspect": pixel_apsect, - "frameStart": frame_start, - "frameEnd": frame_end, - "fps": frame_rate, - "fieldOrder": field_order + "scenePixelAspect": pixel_apsect, + "sceneFps": frame_rate, + "sceneFieldOrder": field_order, + "sceneMarkIn": int(mark_in_frame), + "sceneMarkInState": mark_in_state == "set", + "sceneMarkOut": int(mark_out_frame), + "sceneMarkOutState": mark_out_state == "set" } self.log.debug( "Scene data: {}".format(json.dumps(scene_data, indent=4)) ) context.data.update(scene_data) - - def collect_clip_frames(self): - clip_info_str = lib.execute_george("tv_clipinfo") - self.log.debug("Clip info: {}".format(clip_info_str)) - clip_info_items = clip_info_str.split(" ") - # Color index - not used - clip_info_items.pop(-1) - clip_info_items.pop(-1) - - mark_out = int(clip_info_items.pop(-1)) - frame_end = mark_out + 1 - clip_info_items.pop(-1) - - mark_in = int(clip_info_items.pop(-1)) - frame_start = mark_in + 1 - clip_info_items.pop(-1) - - return frame_start, frame_end diff --git a/openpype/hosts/tvpaint/plugins/publish/validate_marks.py b/openpype/hosts/tvpaint/plugins/publish/validate_marks.py new file mode 100644 index 0000000000..73486d1005 --- /dev/null +++ b/openpype/hosts/tvpaint/plugins/publish/validate_marks.py @@ -0,0 +1,64 @@ +import json + +import pyblish.api +from avalon.tvpaint import lib + + +class ValidateMarksRepair(pyblish.api.Action): + """Repair the marks.""" + + label = "Repair" + icon = "wrench" + on = "failed" + + def process(self, context, plugin): + expected_data = ValidateMarks.get_expected_data(context) + + expected_data["markIn"] -= 1 + expected_data["markOut"] -= 1 + + lib.execute_george("tv_markin {} set".format(expected_data["markIn"])) + lib.execute_george( + "tv_markout {} set".format(expected_data["markOut"]) + ) + + +class ValidateMarks(pyblish.api.ContextPlugin): + """Validate mark in and out are enabled.""" + + label = "Validate Marks" + order = pyblish.api.ValidatorOrder + optional = True + actions = [ValidateMarksRepair] + + @staticmethod + def get_expected_data(context): + return { + "markIn": int(context.data["frameStart"]), + "markInState": True, + "markOut": int(context.data["frameEnd"]), + "markOutState": True + } + + def process(self, context): + current_data = { + "markIn": context.data["sceneMarkIn"] + 1, + "markInState": context.data["sceneMarkInState"], + "markOut": context.data["sceneMarkOut"] + 1, + "markOutState": context.data["sceneMarkOutState"] + } + expected_data = self.get_expected_data(context) + invalid = {} + for k in current_data.keys(): + if current_data[k] != expected_data[k]: + invalid[k] = { + "current": current_data[k], + "expected": expected_data[k] + } + + if invalid: + raise AssertionError( + "Marks does not match database:\n{}".format( + json.dumps(invalid, sort_keys=True, indent=4) + ) + ) diff --git a/openpype/hosts/tvpaint/plugins/publish/validate_project_settings.py b/openpype/hosts/tvpaint/plugins/publish/validate_project_settings.py new file mode 100644 index 0000000000..84c03a9857 --- /dev/null +++ b/openpype/hosts/tvpaint/plugins/publish/validate_project_settings.py @@ -0,0 +1,34 @@ +import json + +import pyblish.api + + +class ValidateProjectSettings(pyblish.api.ContextPlugin): + """Validate project settings against database. + """ + + label = "Validate Project Settings" + order = pyblish.api.ValidatorOrder + optional = True + + def process(self, context): + scene_data = { + "fps": context.data.get("sceneFps"), + "resolutionWidth": context.data.get("sceneWidth"), + "resolutionHeight": context.data.get("sceneHeight"), + "pixelAspect": context.data.get("scenePixelAspect") + } + invalid = {} + for k in scene_data.keys(): + expected_value = context.data["assetEntity"]["data"][k] + if scene_data[k] != expected_value: + invalid[k] = { + "current": scene_data[k], "expected": expected_value + } + + if invalid: + raise AssertionError( + "Project settings does not match database:\n{}".format( + json.dumps(invalid, sort_keys=True, indent=4) + ) + ) diff --git a/openpype/hosts/unreal/__init__.py b/openpype/hosts/unreal/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openpype/hosts/unreal/hooks/pre_workfile_preparation.py b/openpype/hosts/unreal/hooks/pre_workfile_preparation.py index 5945d0486b..c698be63de 100644 --- a/openpype/hosts/unreal/hooks/pre_workfile_preparation.py +++ b/openpype/hosts/unreal/hooks/pre_workfile_preparation.py @@ -23,8 +23,8 @@ class UnrealPrelaunchHook(PreLaunchHook): def execute(self): asset_name = self.data["asset_name"] task_name = self.data["task_name"] - workdir = self.env["AVALON_WORKDIR"] - engine_version = self.app_name.split("_")[-1] + workdir = self.launch_context.env["AVALON_WORKDIR"] + engine_version = self.app_name.split("_")[-1].replace("-", ".") unreal_project_name = f"{asset_name}_{task_name}" # Unreal is sensitive about project names longer then 20 chars @@ -81,8 +81,8 @@ class UnrealPrelaunchHook(PreLaunchHook): # Set "AVALON_UNREAL_PLUGIN" to current process environment for # execution of `create_unreal_project` env_key = "AVALON_UNREAL_PLUGIN" - if self.env.get(env_key): - os.environ[env_key] = self.env[env_key] + if self.launch_context.env.get(env_key): + os.environ[env_key] = self.launch_context.env[env_key] unreal_lib.create_unreal_project( unreal_project_name, diff --git a/openpype/lib/__init__.py b/openpype/lib/__init__.py index 554c0d8ec3..2c1c70e663 100644 --- a/openpype/lib/__init__.py +++ b/openpype/lib/__init__.py @@ -9,7 +9,7 @@ import site # add Python version specific vendor folder site.addsitedir( os.path.join( - os.getenv("OPENPYPE_ROOT", ""), + os.getenv("OPENPYPE_REPOS_ROOT", ""), "vendor", "python", "python_{}".format(sys.version[0]))) from .terminal import Terminal @@ -104,7 +104,8 @@ from .plugin_tools import ( from .local_settings import ( IniSettingRegistry, JSONSettingRegistry, - PypeSettingsRegistry, + OpenPypeSecureRegistry, + OpenPypeSettingsRegistry, get_local_site_id, change_openpype_mongo_url ) @@ -217,7 +218,8 @@ __all__ = [ "IniSettingRegistry", "JSONSettingRegistry", - "PypeSettingsRegistry", + "OpenPypeSecureRegistry", + "OpenPypeSettingsRegistry", "get_local_site_id", "change_openpype_mongo_url", diff --git a/openpype/lib/anatomy.py b/openpype/lib/anatomy.py index ff15aec41a..c16c6e2e99 100644 --- a/openpype/lib/anatomy.py +++ b/openpype/lib/anatomy.py @@ -216,7 +216,7 @@ class Anatomy: """Returns value of root key from template.""" root_templates = [] for group in re.findall(self.root_key_regex, template): - root_templates.append(group) + root_templates.append("{" + group + "}") if not root_templates: return None diff --git a/openpype/lib/applications.py b/openpype/lib/applications.py index e043c9d05c..51c646d494 100644 --- a/openpype/lib/applications.py +++ b/openpype/lib/applications.py @@ -17,6 +17,10 @@ from openpype.settings import ( get_project_settings, get_environments ) +from openpype.settings.constants import ( + METADATA_KEYS, + M_DYNAMIC_KEY_LABEL +) from . import ( PypeLogger, Anatomy @@ -72,7 +76,7 @@ class ApplictionExecutableNotFound(Exception): for executable in application.executables: details += "\n- " + executable.executable_path - self.msg = msg.format(application.full_label, application.name) + self.msg = msg.format(application.full_label, application.full_name) self.details = details exc_mgs = str(self.msg) @@ -123,7 +127,16 @@ class ApplicationGroup: self.host_name = host_name variants = data.get("variants") or {} + key_label_mapping = variants.pop(M_DYNAMIC_KEY_LABEL, {}) for variant_name, variant_data in variants.items(): + if variant_name in METADATA_KEYS: + continue + + if "variant_label" not in variant_data: + variant_label = key_label_mapping.get(variant_name) + if variant_label: + variant_data["variant_label"] = variant_label + variants[variant_name] = Application( variant_name, variant_data, self ) @@ -165,7 +178,7 @@ class Application: enabled = False if group.enabled: enabled = data.get("enabled", True) - self.enabled = enabled + self.enabled = enabled self.label = data.get("variant_label") or name self.full_name = "/".join((group.name, name)) @@ -244,7 +257,7 @@ class Application: Returns: subprocess.Popen: Return executed process as Popen object. """ - return self.manager.launch(self.name, *args, **kwargs) + return self.manager.launch(self.full_name, *args, **kwargs) class ApplicationManager: @@ -265,22 +278,31 @@ class ApplicationManager: self.tool_groups.clear() self.tools.clear() - settings = get_system_settings() + settings = get_system_settings( + clear_metadata=False, exclude_locals=False + ) app_defs = settings["applications"] for group_name, variant_defs in app_defs.items(): + if group_name in METADATA_KEYS: + continue + group = ApplicationGroup(group_name, variant_defs, self) self.app_groups[group_name] = group for app in group: - # TODO This should be replaced with `full_name` in future - self.applications[app.name] = app + self.applications[app.full_name] = app tools_definitions = settings["tools"]["tool_groups"] + tool_label_mapping = tools_definitions.pop(M_DYNAMIC_KEY_LABEL, {}) for tool_group_name, tool_group_data in tools_definitions.items(): - if not tool_group_name: + if not tool_group_name or tool_group_name in METADATA_KEYS: continue + + tool_group_label = ( + tool_label_mapping.get(tool_group_name) or tool_group_name + ) group = EnvironmentToolGroup( - tool_group_name, tool_group_data, self + tool_group_name, tool_group_label, tool_group_data, self ) self.tool_groups[tool_group_name] = group for tool in group: @@ -336,16 +358,24 @@ class EnvironmentToolGroup: manager (ApplicationManager): Manager that creates the group. """ - def __init__(self, name, data, manager): + def __init__(self, name, label, data, manager): self.name = name + self.label = label self._data = data self.manager = manager self._environment = data["environment"] variants = data.get("variants") or {} + label_by_key = variants.pop(M_DYNAMIC_KEY_LABEL, {}) variants_by_name = {} for variant_name, variant_env in variants.items(): - tool = EnvironmentTool(variant_name, variant_env, self) + if variant_name in METADATA_KEYS: + continue + + variant_label = label_by_key.get(variant_name) or variant_name + tool = EnvironmentTool( + variant_name, variant_label, variant_env, self + ) variants_by_name[variant_name] = tool self.variants = variants_by_name @@ -372,8 +402,10 @@ class EnvironmentTool: group (str): Name of group which wraps tool. """ - def __init__(self, name, environment, group): + def __init__(self, name, label, environment, group): self.name = name + self.variant_label = label + self.label = " ".join((group.label, label)) self.group = group self._environment = environment self.full_name = "/".join((group.name, name)) @@ -502,7 +534,7 @@ class LaunchHook: @property def app_name(self): - return getattr(self.application, "name", None) + return getattr(self.application, "full_name", None) def validate(self): """Optional validation of launch hook on initialization. @@ -804,10 +836,15 @@ class ApplicationLaunchContext: self.log.debug("All prelaunch hook executed. Starting new process.") # Prepare subprocess args - args = self.clear_launch_args(self.launch_args) - self.log.debug( - "Launching \"{}\" with args ({}): {}".format( - self.app_name, len(args), args + args_len_str = "" + if isinstance(self.launch_args, str): + args = self.launch_args + else: + args = self.clear_launch_args(self.launch_args) + args_len_str = " ({})".format(len(args)) + self.log.info( + "Launching \"{}\" with args{}: {}".format( + self.app_name, args_len_str, args ) ) # Run process @@ -853,7 +890,10 @@ class ApplicationLaunchContext: Return: list: Unpacked arguments. """ - while True: + if isinstance(args, str): + return args + all_cleared = False + while not all_cleared: all_cleared = True new_args = [] for arg in args: @@ -865,8 +905,6 @@ class ApplicationLaunchContext: new_args.append(arg) args = new_args - if all_cleared: - break return args @@ -939,7 +977,7 @@ def get_app_environments_for_context( "project_name": project_name, "asset_name": asset_name, "task_name": task_name, - "app_name": app_name, + "app": app, "dbcon": dbcon, @@ -1117,8 +1155,7 @@ def prepare_context_environments(data): "AVALON_ASSET": asset_doc["name"], "AVALON_TASK": task_name, "AVALON_APP": app.host_name, - # TODO this hould be `app.full_name` in future PRs - "AVALON_APP_NAME": app.name, + "AVALON_APP_NAME": app.full_name, "AVALON_WORKDIR": workdir } log.debug( diff --git a/openpype/lib/avalon_context.py b/openpype/lib/avalon_context.py index 1f7c693b85..2d8726352a 100644 --- a/openpype/lib/avalon_context.py +++ b/openpype/lib/avalon_context.py @@ -1123,6 +1123,7 @@ class BuildWorkfile: return output +@with_avalon def get_creator_by_name(creator_name, case_sensitive=False): """Find creator plugin by name. diff --git a/openpype/lib/import_utils.py b/openpype/lib/import_utils.py index 5fca0ae5f9..4e72618803 100644 --- a/openpype/lib/import_utils.py +++ b/openpype/lib/import_utils.py @@ -8,7 +8,7 @@ log = Logger().get_logger(__name__) def discover_host_vendor_module(module_name): host = os.environ["AVALON_APP"] - pype_root = os.environ["OPENPYPE_ROOT"] + pype_root = os.environ["OPENPYPE_REPOS_ROOT"] main_module = module_name.split(".")[0] module_path = os.path.join( pype_root, "hosts", host, "vendor", main_module) diff --git a/openpype/lib/local_settings.py b/openpype/lib/local_settings.py index 82507cb0c0..56bdd047c9 100644 --- a/openpype/lib/local_settings.py +++ b/openpype/lib/local_settings.py @@ -5,6 +5,7 @@ from datetime import datetime from abc import ABCMeta, abstractmethod import json +# TODO Use pype igniter logic instead of using duplicated code # disable lru cache in Python 2 try: from functools import lru_cache @@ -25,11 +26,115 @@ except ImportError: import platform -import appdirs import six +import appdirs from .import validate_mongo_connection +_PLACEHOLDER = object() + + +class OpenPypeSecureRegistry: + """Store information using keyring. + + Registry should be used for private data that should be available only for + user. + + All passed registry names will have added prefix `OpenPype/` to easier + identify which data were created by OpenPype. + + Args: + name(str): Name of registry used as identifier for data. + """ + def __init__(self, name): + try: + import keyring + + except Exception: + raise NotImplementedError( + "Python module `keyring` is not available." + ) + + # hack for cx_freeze and Windows keyring backend + if platform.system().lower() == "windows": + from keyring.backends import Windows + + keyring.set_keyring(Windows.WinVaultKeyring()) + + # Force "OpenPype" prefix + self._name = "/".join(("OpenPype", name)) + + def set_item(self, name, value): + # type: (str, str) -> None + """Set sensitive item into system's keyring. + + This uses `Keyring module`_ to save sensitive stuff into system's + keyring. + + Args: + name (str): Name of the item. + value (str): Value of the item. + + .. _Keyring module: + https://github.com/jaraco/keyring + + """ + import keyring + + keyring.set_password(self._name, name, value) + + @lru_cache(maxsize=32) + def get_item(self, name, default=_PLACEHOLDER): + """Get value of sensitive item from system's keyring. + + See also `Keyring module`_ + + Args: + name (str): Name of the item. + default (Any): Default value if item is not available. + + Returns: + value (str): Value of the item. + + Raises: + ValueError: If item doesn't exist and default is not defined. + + .. _Keyring module: + https://github.com/jaraco/keyring + + """ + import keyring + + value = keyring.get_password(self._name, name) + if value is not None: + return value + + if default is not _PLACEHOLDER: + return default + + # NOTE Should raise `KeyError` + raise ValueError( + "Item {}:{} does not exist in keyring.".format(self._name, name) + ) + + def delete_item(self, name): + # type: (str) -> None + """Delete value stored in system's keyring. + + See also `Keyring module`_ + + Args: + name (str): Name of the item to be deleted. + + .. _Keyring module: + https://github.com/jaraco/keyring + + """ + import keyring + + self.get_item.cache_clear() + keyring.delete_password(self._name, name) + @six.add_metaclass(ABCMeta) class ASettingRegistry(): @@ -48,13 +153,6 @@ class ASettingRegistry(): # type: (str) -> ASettingRegistry super(ASettingRegistry, self).__init__() - if six.PY3: - import keyring - # hack for cx_freeze and Windows keyring backend - if platform.system() == "Windows": - from keyring.backends import Windows - keyring.set_keyring(Windows.WinVaultKeyring()) - self._name = name self._items = {} @@ -120,7 +218,7 @@ class ASettingRegistry(): """Delete item from settings. Note: - see :meth:`pype.lib.local_settings.ARegistrySettings.delete_item` + see :meth:`openpype.lib.user_settings.ARegistrySettings.delete_item` """ pass @@ -129,78 +227,6 @@ class ASettingRegistry(): del self._items[name] self._delete_item(name) - def set_secure_item(self, name, value): - # type: (str, str) -> None - """Set sensitive item into system's keyring. - - This uses `Keyring module`_ to save sensitive stuff into system's - keyring. - - Args: - name (str): Name of the item. - value (str): Value of the item. - - .. _Keyring module: - https://github.com/jaraco/keyring - - """ - if six.PY2: - raise NotImplementedError( - "Keyring not available on Python 2 hosts") - import keyring - keyring.set_password(self._name, name, value) - - @lru_cache(maxsize=32) - def get_secure_item(self, name): - # type: (str) -> str - """Get value of sensitive item from system's keyring. - - See also `Keyring module`_ - - Args: - name (str): Name of the item. - - Returns: - value (str): Value of the item. - - Raises: - ValueError: If item doesn't exist. - - .. _Keyring module: - https://github.com/jaraco/keyring - - """ - if six.PY2: - raise NotImplementedError( - "Keyring not available on Python 2 hosts") - import keyring - value = keyring.get_password(self._name, name) - if not value: - raise ValueError( - "Item {}:{} does not exist in keyring.".format( - self._name, name)) - return value - - def delete_secure_item(self, name): - # type: (str) -> None - """Delete value stored in system's keyring. - - See also `Keyring module`_ - - Args: - name (str): Name of the item to be deleted. - - .. _Keyring module: - https://github.com/jaraco/keyring - - """ - if six.PY2: - raise NotImplementedError( - "Keyring not available on Python 2 hosts") - import keyring - self.get_secure_item.cache_clear() - keyring.delete_password(self._name, name) - class IniSettingRegistry(ASettingRegistry): """Class using :mod:`configparser`. @@ -218,7 +244,7 @@ class IniSettingRegistry(ASettingRegistry): if not os.path.exists(self._registry_file): with open(self._registry_file, mode="w") as cfg: print("# Settings registry", cfg) - print("# Generated by Pype {}".format(version), cfg) + print("# Generated by OpenPype {}".format(version), cfg) now = datetime.now().strftime("%d/%m/%Y %H:%M:%S") print("# {}".format(now), cfg) @@ -352,7 +378,7 @@ class IniSettingRegistry(ASettingRegistry): """Delete item from default section. Note: - See :meth:`~pype.lib.IniSettingsRegistry.delete_item_from_section` + See :meth:`~openpype.lib.IniSettingsRegistry.delete_item_from_section` """ self.delete_item_from_section("MAIN", name) @@ -369,7 +395,7 @@ class JSONSettingRegistry(ASettingRegistry): now = datetime.now().strftime("%d/%m/%Y %H:%M:%S") header = { "__metadata__": { - "pype-version": os.getenv("OPENPYPE_VERSION", "N/A"), + "openpype-version": os.getenv("OPENPYPE_VERSION", "N/A"), "generated": now }, "registry": {} @@ -387,7 +413,7 @@ class JSONSettingRegistry(ASettingRegistry): """Get item value from registry json. Note: - See :meth:`pype.lib.JSONSettingRegistry.get_item` + See :meth:`openpype.lib.JSONSettingRegistry.get_item` """ with open(self._registry_file, mode="r") as cfg: @@ -420,7 +446,7 @@ class JSONSettingRegistry(ASettingRegistry): """Set item value to registry json. Note: - See :meth:`pype.lib.JSONSettingRegistry.set_item` + See :meth:`openpype.lib.JSONSettingRegistry.set_item` """ with open(self._registry_file, "r+") as cfg: @@ -452,8 +478,8 @@ class JSONSettingRegistry(ASettingRegistry): json.dump(data, cfg, indent=4) -class PypeSettingsRegistry(JSONSettingRegistry): - """Class handling Pype general settings registry. +class OpenPypeSettingsRegistry(JSONSettingRegistry): + """Class handling OpenPype general settings registry. Attributes: vendor (str): Name used for path construction. @@ -461,21 +487,23 @@ class PypeSettingsRegistry(JSONSettingRegistry): """ - def __init__(self): + def __init__(self, name=None): self.vendor = "pypeclub" - self.product = "pype" + self.product = "openpype" + if not name: + name = "openpype_settings" path = appdirs.user_data_dir(self.product, self.vendor) - super(PypeSettingsRegistry, self).__init__("pype_settings", path) + super(OpenPypeSettingsRegistry, self).__init__(name, path) def _create_local_site_id(registry=None): """Create a local site identifier.""" - from uuid import uuid4 + from coolname import generate_slug if registry is None: - registry = PypeSettingsRegistry() + registry = OpenPypeSettingsRegistry() - new_id = str(uuid4()) + new_id = generate_slug(3) print("Created local site id \"{}\"".format(new_id)) @@ -489,7 +517,7 @@ def get_local_site_id(): Identifier is created if does not exists yet. """ - registry = PypeSettingsRegistry() + registry = OpenPypeSettingsRegistry() try: return registry.get_item("localId") except ValueError: @@ -504,5 +532,9 @@ def change_openpype_mongo_url(new_mongo_url): """ validate_mongo_connection(new_mongo_url) - registry = PypeSettingsRegistry() - registry.set_secure_item("pypeMongo", new_mongo_url) + key = "openPypeMongo" + registry = OpenPypeSecureRegistry("mongodb") + existing_value = registry.get_item(key, None) + if existing_value is not None: + registry.delete_item(key) + registry.set_item(key, new_mongo_url) diff --git a/openpype/lib/pype_info.py b/openpype/lib/pype_info.py index 93d669eb0d..c56782be9e 100644 --- a/openpype/lib/pype_info.py +++ b/openpype/lib/pype_info.py @@ -28,7 +28,7 @@ def get_pype_info(): "version": get_pype_version(), "version_type": version_type, "executable": executable_args[-1], - "pype_root": os.environ["OPENPYPE_ROOT"], + "pype_root": os.environ["OPENPYPE_REPOS_ROOT"], "mongo_url": os.environ["OPENPYPE_MONGO"] } diff --git a/openpype/modules/__init__.py b/openpype/modules/__init__.py index 4b120647e1..d7c6d99fe6 100644 --- a/openpype/modules/__init__.py +++ b/openpype/modules/__init__.py @@ -41,7 +41,7 @@ from .log_viewer import LogViewModule from .muster import MusterModule from .deadline import DeadlineModule from .standalonepublish_action import StandAlonePublishAction -from .sync_server import SyncServer +from .sync_server import SyncServerModule __all__ = ( @@ -82,5 +82,5 @@ __all__ = ( "DeadlineModule", "StandAlonePublishAction", - "SyncServer" + "SyncServerModule" ) diff --git a/openpype/modules/clockify/clockify_api.py b/openpype/modules/clockify/clockify_api.py index d88b2ef8df..29de5de0c9 100644 --- a/openpype/modules/clockify/clockify_api.py +++ b/openpype/modules/clockify/clockify_api.py @@ -1,13 +1,16 @@ import os import re import time -import requests import json import datetime +import requests from .constants import ( - CLOCKIFY_ENDPOINT, ADMIN_PERMISSION_NAMES, CREDENTIALS_JSON_PATH + CLOCKIFY_ENDPOINT, + ADMIN_PERMISSION_NAMES ) +from openpype.lib.local_settings import OpenPypeSecureRegistry + def time_check(obj): if obj.request_counter < 10: @@ -31,6 +34,8 @@ class ClockifyAPI: self.request_counter = 0 self.request_time = time.time() + self.secure_registry = OpenPypeSecureRegistry("clockify") + @property def headers(self): return {"X-Api-Key": self.api_key} @@ -129,22 +134,10 @@ class ClockifyAPI: return False def get_api_key(self): - api_key = None - try: - file = open(CREDENTIALS_JSON_PATH, 'r') - api_key = json.load(file).get('api_key', None) - if api_key == '': - api_key = None - except Exception: - file = open(CREDENTIALS_JSON_PATH, 'w') - file.close() - return api_key + return self.secure_registry.get_item("api_key", None) def save_api_key(self, api_key): - data = {'api_key': api_key} - file = open(CREDENTIALS_JSON_PATH, 'w') - file.write(json.dumps(data)) - file.close() + self.secure_registry.set_item("api_key", api_key) def get_workspaces(self): action_url = 'workspaces/' diff --git a/openpype/modules/clockify/constants.py b/openpype/modules/clockify/constants.py index 38ad4b64cf..66f6cb899a 100644 --- a/openpype/modules/clockify/constants.py +++ b/openpype/modules/clockify/constants.py @@ -1,17 +1,12 @@ import os -import appdirs CLOCKIFY_FTRACK_SERVER_PATH = os.path.join( - os.path.dirname(__file__), "ftrack", "server" + os.path.dirname(os.path.abspath(__file__)), "ftrack", "server" ) CLOCKIFY_FTRACK_USER_PATH = os.path.join( - os.path.dirname(__file__), "ftrack", "user" + os.path.dirname(os.path.abspath(__file__)), "ftrack", "user" ) -CREDENTIALS_JSON_PATH = os.path.normpath(os.path.join( - appdirs.user_data_dir("pype-app", "pype"), - "clockify.json" -)) ADMIN_PERMISSION_NAMES = ["WORKSPACE_OWN", "WORKSPACE_ADMIN"] CLOCKIFY_ENDPOINT = "https://api.clockify.me/api/" diff --git a/openpype/modules/deadline/plugins/publish/submit_harmony_deadline..py b/openpype/modules/deadline/plugins/publish/submit_harmony_deadline.py similarity index 99% rename from openpype/modules/deadline/plugins/publish/submit_harmony_deadline..py rename to openpype/modules/deadline/plugins/publish/submit_harmony_deadline.py index 58379443f7..ba1ffdcf30 100644 --- a/openpype/modules/deadline/plugins/publish/submit_harmony_deadline..py +++ b/openpype/modules/deadline/plugins/publish/submit_harmony_deadline.py @@ -252,7 +252,7 @@ class HarmonySubmitDeadline( def get_job_info(self): job_info = DeadlineJobInfo("Harmony") job_info.Name = self._instance.data["name"] - job_info.Plugin = "HarmonyPype" + job_info.Plugin = "HarmonyOpenPype" job_info.Frames = "{}-{}".format( self._instance.data["frameStartHandle"], self._instance.data["frameEndHandle"] diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py index a2e21fb766..ea953441a2 100644 --- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py +++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py @@ -102,7 +102,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin): hosts = ["fusion", "maya", "nuke", "celaction", "aftereffects", "harmony"] - families = ["render.farm", "prerender", + families = ["render.farm", "prerender.farm", "renderlayer", "imagesequence", "vrayscene"] aov_filter = {"maya": [r".+(?:\.|_)([Bb]eauty)(?:\.|_).*"], diff --git a/openpype/modules/ftrack/event_handlers_server/action_prepare_project.py b/openpype/modules/ftrack/event_handlers_server/action_prepare_project.py new file mode 100644 index 0000000000..8248bf532e --- /dev/null +++ b/openpype/modules/ftrack/event_handlers_server/action_prepare_project.py @@ -0,0 +1,365 @@ +import json + +from openpype.api import ProjectSettings + +from openpype.modules.ftrack.lib import ServerAction +from openpype.modules.ftrack.lib.avalon_sync import ( + get_pype_attr, + CUST_ATTR_AUTO_SYNC +) + + +class PrepareProjectServer(ServerAction): + """Prepare project attributes in Anatomy.""" + + identifier = "prepare.project.server" + label = "OpenPype Admin" + variant = "- Prepare Project (Server)" + description = "Set basic attributes on the project" + + settings_key = "prepare_project" + + role_list = ["Pypeclub", "Administrator", "Project Manager"] + + # Key to store info about trigerring create folder structure + item_splitter = {"type": "label", "value": "---"} + + def discover(self, session, entities, event): + """Show only on project.""" + if ( + len(entities) != 1 + or entities[0].entity_type.lower() != "project" + ): + return False + + return self.valid_roles(session, entities, event) + + def interface(self, session, entities, event): + if event['data'].get('values', {}): + return + + # Inform user that this may take a while + self.show_message(event, "Preparing data... Please wait", True) + self.log.debug("Preparing data which will be shown") + + self.log.debug("Loading custom attributes") + + project_entity = entities[0] + project_name = project_entity["full_name"] + + try: + project_settings = ProjectSettings(project_name) + except ValueError: + return { + "message": "Project is not synchronized yet", + "success": False + } + + project_anatom_settings = project_settings["project_anatomy"] + root_items = self.prepare_root_items(project_anatom_settings) + + ca_items, multiselect_enumerators = ( + self.prepare_custom_attribute_items(project_anatom_settings) + ) + + self.log.debug("Heavy items are ready. Preparing last items group.") + + title = "Prepare Project" + items = [] + + # Add root items + items.extend(root_items) + + items.append(self.item_splitter) + items.append({ + "type": "label", + "value": "

Set basic Attributes:

" + }) + + items.extend(ca_items) + + # This item will be last (before enumerators) + # - sets value of auto synchronization + auto_sync_name = "avalon_auto_sync" + auto_sync_value = project_entity["custom_attributes"].get( + CUST_ATTR_AUTO_SYNC, False + ) + auto_sync_item = { + "name": auto_sync_name, + "type": "boolean", + "value": auto_sync_value, + "label": "AutoSync to Avalon" + } + # Add autosync attribute + items.append(auto_sync_item) + + # Add enumerator items at the end + for item in multiselect_enumerators: + items.append(item) + + return { + "items": items, + "title": title + } + + def prepare_root_items(self, project_anatom_settings): + self.log.debug("Root items preparation begins.") + + root_items = [] + root_items.append({ + "type": "label", + "value": "

Check your Project root settings

" + }) + root_items.append({ + "type": "label", + "value": ( + "

NOTE: Roots are crutial for path filling" + " (and creating folder structure).

" + ) + }) + root_items.append({ + "type": "label", + "value": ( + "

WARNING: Do not change roots on running project," + " that will cause workflow issues.

" + ) + }) + + empty_text = "Enter root path here..." + + roots_entity = project_anatom_settings["roots"] + for root_name, root_entity in roots_entity.items(): + root_items.append(self.item_splitter) + root_items.append({ + "type": "label", + "value": "Root: \"{}\"".format(root_name) + }) + for platform_name, value_entity in root_entity.items(): + root_items.append({ + "label": platform_name, + "name": "__root__{}__{}".format(root_name, platform_name), + "type": "text", + "value": value_entity.value, + "empty_text": empty_text + }) + + root_items.append({ + "type": "hidden", + "name": "__rootnames__", + "value": json.dumps(list(roots_entity.keys())) + }) + + self.log.debug("Root items preparation ended.") + return root_items + + def _attributes_to_set(self, project_anatom_settings): + attributes_to_set = {} + + attribute_values_by_key = {} + for key, entity in project_anatom_settings["attributes"].items(): + attribute_values_by_key[key] = entity.value + + cust_attrs, hier_cust_attrs = get_pype_attr(self.session, True) + + for attr in hier_cust_attrs: + key = attr["key"] + if key.startswith("avalon_"): + continue + attributes_to_set[key] = { + "label": attr["label"], + "object": attr, + "default": attribute_values_by_key.get(key) + } + + for attr in cust_attrs: + if attr["entity_type"].lower() != "show": + continue + key = attr["key"] + if key.startswith("avalon_"): + continue + attributes_to_set[key] = { + "label": attr["label"], + "object": attr, + "default": attribute_values_by_key.get(key) + } + + # Sort by label + attributes_to_set = dict(sorted( + attributes_to_set.items(), + key=lambda x: x[1]["label"] + )) + return attributes_to_set + + def prepare_custom_attribute_items(self, project_anatom_settings): + items = [] + multiselect_enumerators = [] + attributes_to_set = self._attributes_to_set(project_anatom_settings) + + self.log.debug("Preparing interface for keys: \"{}\"".format( + str([key for key in attributes_to_set]) + )) + + for key, in_data in attributes_to_set.items(): + attr = in_data["object"] + + # initial item definition + item = { + "name": key, + "label": in_data["label"] + } + + # cust attr type - may have different visualization + type_name = attr["type"]["name"].lower() + easy_types = ["text", "boolean", "date", "number"] + + easy_type = False + if type_name in easy_types: + easy_type = True + + elif type_name == "enumerator": + + attr_config = json.loads(attr["config"]) + attr_config_data = json.loads(attr_config["data"]) + + if attr_config["multiSelect"] is True: + multiselect_enumerators.append(self.item_splitter) + multiselect_enumerators.append({ + "type": "label", + "value": in_data["label"] + }) + + default = in_data["default"] + names = [] + for option in sorted( + attr_config_data, key=lambda x: x["menu"] + ): + name = option["value"] + new_name = "__{}__{}".format(key, name) + names.append(new_name) + item = { + "name": new_name, + "type": "boolean", + "label": "- {}".format(option["menu"]) + } + if default: + if isinstance(default, (list, tuple)): + if name in default: + item["value"] = True + else: + if name == default: + item["value"] = True + + multiselect_enumerators.append(item) + + multiselect_enumerators.append({ + "type": "hidden", + "name": "__hidden__{}".format(key), + "value": json.dumps(names) + }) + else: + easy_type = True + item["data"] = attr_config_data + + else: + self.log.warning(( + "Custom attribute \"{}\" has type \"{}\"." + " I don't know how to handle" + ).format(key, type_name)) + items.append({ + "type": "label", + "value": ( + "!!! Can't handle Custom attritubte type \"{}\"" + " (key: \"{}\")" + ).format(type_name, key) + }) + + if easy_type: + item["type"] = type_name + + # default value in interface + default = in_data["default"] + if default is not None: + item["value"] = default + + items.append(item) + + return items, multiselect_enumerators + + def launch(self, session, entities, event): + if not event['data'].get('values', {}): + return + + in_data = event['data']['values'] + + root_values = {} + root_key = "__root__" + for key in tuple(in_data.keys()): + if key.startswith(root_key): + _key = key[len(root_key):] + root_values[_key] = in_data.pop(key) + + root_names = in_data.pop("__rootnames__", None) + root_data = {} + for root_name in json.loads(root_names): + root_data[root_name] = {} + for key, value in tuple(root_values.items()): + prefix = "{}__".format(root_name) + if not key.startswith(prefix): + continue + + _key = key[len(prefix):] + root_data[root_name][_key] = value + + # Find hidden items for multiselect enumerators + keys_to_process = [] + for key in in_data: + if key.startswith("__hidden__"): + keys_to_process.append(key) + + self.log.debug("Preparing data for Multiselect Enumerators") + enumerators = {} + for key in keys_to_process: + new_key = key.replace("__hidden__", "") + enumerator_items = in_data.pop(key) + enumerators[new_key] = json.loads(enumerator_items) + + # find values set for multiselect enumerator + for key, enumerator_items in enumerators.items(): + in_data[key] = [] + + name = "__{}__".format(key) + + for item in enumerator_items: + value = in_data.pop(item) + if value is True: + new_key = item.replace(name, "") + in_data[key].append(new_key) + + self.log.debug("Setting Custom Attribute values") + + project_name = entities[0]["full_name"] + project_settings = ProjectSettings(project_name) + project_anatomy_settings = project_settings["project_anatomy"] + project_anatomy_settings["roots"] = root_data + + custom_attribute_values = {} + attributes_entity = project_anatomy_settings["attributes"] + for key, value in in_data.items(): + if key not in attributes_entity: + custom_attribute_values[key] = value + else: + attributes_entity[key] = value + + project_settings.save() + + entity = entities[0] + for key, value in custom_attribute_values.items(): + entity["custom_attributes"][key] = value + self.log.debug("- Key \"{}\" set to \"{}\"".format(key, value)) + + return True + + +def register(session): + '''Register plugin. Called when used as an plugin.''' + PrepareProjectServer(session).register() diff --git a/openpype/modules/ftrack/event_handlers_user/action_create_cust_attrs.py b/openpype/modules/ftrack/event_handlers_user/action_create_cust_attrs.py index 0ebd221e9f..63025d35b3 100644 --- a/openpype/modules/ftrack/event_handlers_user/action_create_cust_attrs.py +++ b/openpype/modules/ftrack/event_handlers_user/action_create_cust_attrs.py @@ -400,9 +400,9 @@ class CustomAttributes(BaseAction): def tools_attribute(self, event): tools_data = [] - for tool_name in self.app_manager.tools.keys(): + for tool_name, tool in self.app_manager.tools.items(): tools_data.append({ - tool_name: tool_name + tool_name: tool.label }) # Make sure there is at least one item diff --git a/openpype/modules/ftrack/event_handlers_user/action_prepare_project.py b/openpype/modules/ftrack/event_handlers_user/action_prepare_project.py index 7f674310fc..bd25f995fe 100644 --- a/openpype/modules/ftrack/event_handlers_user/action_prepare_project.py +++ b/openpype/modules/ftrack/event_handlers_user/action_prepare_project.py @@ -1,31 +1,34 @@ -import os import json -from openpype.modules.ftrack.lib import BaseAction, statics_icon -from openpype.api import config, Anatomy -from openpype.modules.ftrack.lib.avalon_sync import get_pype_attr +from openpype.api import ProjectSettings + +from openpype.modules.ftrack.lib import ( + BaseAction, + statics_icon +) +from openpype.modules.ftrack.lib.avalon_sync import ( + get_pype_attr, + CUST_ATTR_AUTO_SYNC +) -class PrepareProject(BaseAction): - '''Edit meta data action.''' +class PrepareProjectLocal(BaseAction): + """Prepare project attributes in Anatomy.""" - #: Action identifier. - identifier = 'prepare.project' - #: Action label. - label = 'Prepare Project' - #: Action description. - description = 'Set basic attributes on the project' - #: roles that are allowed to register this action + identifier = "prepare.project.local" + label = "Prepare Project" + description = "Set basic attributes on the project" icon = statics_icon("ftrack", "action_icons", "PrepareProject.svg") + role_list = ["Pypeclub", "Administrator", "Project Manager"] + settings_key = "prepare_project" # Key to store info about trigerring create folder structure - create_project_structure_key = "create_folder_structure" - item_splitter = {'type': 'label', 'value': '---'} + item_splitter = {"type": "label", "value": "---"} def discover(self, session, entities, event): - ''' Validation ''' + """Show only on project.""" if ( len(entities) != 1 or entities[0].entity_type.lower() != "project" @@ -44,27 +47,22 @@ class PrepareProject(BaseAction): self.log.debug("Loading custom attributes") - project_name = entities[0]["full_name"] + project_entity = entities[0] + project_name = project_entity["full_name"] - project_defaults = ( - config.get_presets(project_name) - .get("ftrack", {}) - .get("project_defaults", {}) - ) - - anatomy = Anatomy(project_name) - if not anatomy.roots: + try: + project_settings = ProjectSettings(project_name) + except ValueError: return { - "success": False, - "message": ( - "Have issues with loading Roots for project \"{}\"." - ).format(anatomy.project_name) + "message": "Project is not synchronized yet", + "success": False } - root_items = self.prepare_root_items(anatomy) + project_anatom_settings = project_settings["project_anatomy"] + root_items = self.prepare_root_items(project_anatom_settings) ca_items, multiselect_enumerators = ( - self.prepare_custom_attribute_items(project_defaults) + self.prepare_custom_attribute_items(project_anatom_settings) ) self.log.debug("Heavy items are ready. Preparing last items group.") @@ -74,19 +72,6 @@ class PrepareProject(BaseAction): # Add root items items.extend(root_items) - items.append(self.item_splitter) - - # Ask if want to trigger Action Create Folder Structure - items.append({ - "type": "label", - "value": "

Want to create basic Folder Structure?

" - }) - items.append({ - "name": self.create_project_structure_key, - "type": "boolean", - "value": False, - "label": "Check if Yes" - }) items.append(self.item_splitter) items.append({ @@ -99,10 +84,13 @@ class PrepareProject(BaseAction): # This item will be last (before enumerators) # - sets value of auto synchronization auto_sync_name = "avalon_auto_sync" + auto_sync_value = project_entity["custom_attributes"].get( + CUST_ATTR_AUTO_SYNC, False + ) auto_sync_item = { "name": auto_sync_name, "type": "boolean", - "value": project_defaults.get(auto_sync_name, False), + "value": auto_sync_value, "label": "AutoSync to Avalon" } # Add autosync attribute @@ -117,13 +105,10 @@ class PrepareProject(BaseAction): "title": title } - def prepare_root_items(self, anatomy): - root_items = [] + def prepare_root_items(self, project_anatom_settings): self.log.debug("Root items preparation begins.") - root_names = anatomy.root_names() - roots = anatomy.roots - + root_items = [] root_items.append({ "type": "label", "value": "

Check your Project root settings

" @@ -143,85 +128,40 @@ class PrepareProject(BaseAction): ) }) - default_roots = anatomy.roots - while isinstance(default_roots, dict): - key = tuple(default_roots.keys())[0] - default_roots = default_roots[key] - empty_text = "Enter root path here..." - # Root names is None when anatomy templates contain "{root}" - all_platforms = ["windows", "linux", "darwin"] - if root_names is None: - root_items.append(self.item_splitter) - # find first possible key - for platform in all_platforms: - value = default_roots.raw_data.get(platform) or "" - root_items.append({ - "label": platform, - "name": "__root__{}".format(platform), - "type": "text", - "value": value, - "empty_text": empty_text - }) - return root_items - - root_name_data = {} - missing_roots = [] - for root_name in root_names: - root_name_data[root_name] = {} - if not isinstance(roots, dict): - missing_roots.append(root_name) - continue - - root_item = roots.get(root_name) - if not root_item: - missing_roots.append(root_name) - continue - - for platform in all_platforms: - root_name_data[root_name][platform] = ( - root_item.raw_data.get(platform) or "" - ) - - if missing_roots: - default_values = {} - for platform in all_platforms: - default_values[platform] = ( - default_roots.raw_data.get(platform) or "" - ) - - for root_name in missing_roots: - root_name_data[root_name] = default_values - - root_names = list(root_name_data.keys()) - root_items.append({ - "type": "hidden", - "name": "__rootnames__", - "value": json.dumps(root_names) - }) - - for root_name, values in root_name_data.items(): + roots_entity = project_anatom_settings["roots"] + for root_name, root_entity in roots_entity.items(): root_items.append(self.item_splitter) root_items.append({ "type": "label", "value": "Root: \"{}\"".format(root_name) }) - for platform, value in values.items(): + for platform_name, value_entity in root_entity.items(): root_items.append({ - "label": platform, - "name": "__root__{}{}".format(root_name, platform), + "label": platform_name, + "name": "__root__{}__{}".format(root_name, platform_name), "type": "text", - "value": value, + "value": value_entity.value, "empty_text": empty_text }) + root_items.append({ + "type": "hidden", + "name": "__rootnames__", + "value": json.dumps(list(roots_entity.keys())) + }) + self.log.debug("Root items preparation ended.") return root_items - def _attributes_to_set(self, project_defaults): + def _attributes_to_set(self, project_anatom_settings): attributes_to_set = {} + attribute_values_by_key = {} + for key, entity in project_anatom_settings["attributes"].items(): + attribute_values_by_key[key] = entity.value + cust_attrs, hier_cust_attrs = get_pype_attr(self.session, True) for attr in hier_cust_attrs: @@ -231,7 +171,7 @@ class PrepareProject(BaseAction): attributes_to_set[key] = { "label": attr["label"], "object": attr, - "default": project_defaults.get(key) + "default": attribute_values_by_key.get(key) } for attr in cust_attrs: @@ -243,7 +183,7 @@ class PrepareProject(BaseAction): attributes_to_set[key] = { "label": attr["label"], "object": attr, - "default": project_defaults.get(key) + "default": attribute_values_by_key.get(key) } # Sort by label @@ -253,10 +193,10 @@ class PrepareProject(BaseAction): )) return attributes_to_set - def prepare_custom_attribute_items(self, project_defaults): + def prepare_custom_attribute_items(self, project_anatom_settings): items = [] multiselect_enumerators = [] - attributes_to_set = self._attributes_to_set(project_defaults) + attributes_to_set = self._attributes_to_set(project_anatom_settings) self.log.debug("Preparing interface for keys: \"{}\"".format( str([key for key in attributes_to_set]) @@ -363,24 +303,15 @@ class PrepareProject(BaseAction): root_names = in_data.pop("__rootnames__", None) root_data = {} - if root_names: - for root_name in json.loads(root_names): - root_data[root_name] = {} - for key, value in tuple(root_values.items()): - if key.startswith(root_name): - _key = key[len(root_name):] - root_data[root_name][_key] = value + for root_name in json.loads(root_names): + root_data[root_name] = {} + for key, value in tuple(root_values.items()): + prefix = "{}__".format(root_name) + if not key.startswith(prefix): + continue - else: - for key, value in root_values.items(): - root_data[key] = value - - # TODO implement creating of anatomy for new projects - # project_name = entities[0]["full_name"] - # anatomy = Anatomy(project_name) - - # pop out info about creating project structure - create_proj_struct = in_data.pop(self.create_project_structure_key) + _key = key[len(prefix):] + root_data[root_name][_key] = value # Find hidden items for multiselect enumerators keys_to_process = [] @@ -407,54 +338,31 @@ class PrepareProject(BaseAction): new_key = item.replace(name, "") in_data[key].append(new_key) - self.log.debug("Setting Custom Attribute values:") - entity = entities[0] + self.log.debug("Setting Custom Attribute values") + + project_name = entities[0]["full_name"] + project_settings = ProjectSettings(project_name) + project_anatomy_settings = project_settings["project_anatomy"] + project_anatomy_settings["roots"] = root_data + + custom_attribute_values = {} + attributes_entity = project_anatomy_settings["attributes"] for key, value in in_data.items(): + if key not in attributes_entity: + custom_attribute_values[key] = value + else: + attributes_entity[key] = value + + project_settings.save() + + entity = entities[0] + for key, value in custom_attribute_values.items(): entity["custom_attributes"][key] = value self.log.debug("- Key \"{}\" set to \"{}\"".format(key, value)) - session.commit() - - # Create project structure - self.create_project_specific_config(entities[0]["full_name"], in_data) - - # Trigger Create Project Structure action - if create_proj_struct is True: - self.trigger_action("create.project.structure", event) - return True - def create_project_specific_config(self, project_name, json_data): - self.log.debug("*** Creating project specifig configs ***") - project_specific_path = project_overrides_dir_path(project_name) - if not os.path.exists(project_specific_path): - os.makedirs(project_specific_path) - self.log.debug(( - "Project specific config folder for project \"{}\" created." - ).format(project_name)) - - # Presets #################################### - self.log.debug("--- Processing Presets Begins: ---") - - project_defaults_dir = os.path.normpath(os.path.join( - project_specific_path, "presets", "ftrack" - )) - project_defaults_path = os.path.normpath(os.path.join( - project_defaults_dir, "project_defaults.json" - )) - # Create folder if not exist - if not os.path.exists(project_defaults_dir): - self.log.debug("Creating Ftrack Presets folder: \"{}\"".format( - project_defaults_dir - )) - os.makedirs(project_defaults_dir) - - with open(project_defaults_path, 'w') as file_stream: - json.dump(json_data, file_stream, indent=4) - - self.log.debug("*** Creating project specifig configs Finished ***") - def register(session): '''Register plugin. Called when used as an plugin.''' - PrepareProject(session).register() + PrepareProjectLocal(session).register() diff --git a/openpype/modules/ftrack/ftrack_module.py b/openpype/modules/ftrack/ftrack_module.py index 8a40cac91a..cd383cbdc6 100644 --- a/openpype/modules/ftrack/ftrack_module.py +++ b/openpype/modules/ftrack/ftrack_module.py @@ -42,7 +42,7 @@ class FtrackModule( ftrack_settings = settings[self.name] self.enabled = ftrack_settings["enabled"] - self.ftrack_url = ftrack_settings["ftrack_server"] + self.ftrack_url = ftrack_settings["ftrack_server"].strip("/ ") current_dir = os.path.dirname(os.path.abspath(__file__)) server_event_handlers_paths = [ @@ -210,3 +210,7 @@ class FtrackModule( def tray_exit(self): return self.tray_module.stop_action_server() + + def set_credentials_to_env(self, username, api_key): + os.environ["FTRACK_API_USER"] = username or "" + os.environ["FTRACK_API_KEY"] = api_key or "" diff --git a/openpype/modules/ftrack/ftrack_server/ftrack_server.py b/openpype/modules/ftrack/ftrack_server/ftrack_server.py index 285ca29dc5..bd67fba3d6 100644 --- a/openpype/modules/ftrack/ftrack_server/ftrack_server.py +++ b/openpype/modules/ftrack/ftrack_server/ftrack_server.py @@ -1,4 +1,5 @@ import os +import time import types import logging import traceback @@ -10,7 +11,6 @@ from openpype.lib import ( modules_from_path ) - log = PypeLogger.get_logger(__name__) """ @@ -120,6 +120,18 @@ class FtrackServer: if not session: session = ftrack_api.Session(auto_connect_event_hub=True) + # Wait until session has connected event hub + if session._auto_connect_event_hub_thread: + # Use timeout from session (since ftrack-api 2.1.0) + timeout = getattr(session, "request_timeout", 60) + started = time.time() + while not session.event_hub.connected: + if (time.time() - started) > timeout: + raise RuntimeError(( + "Connection to Ftrack was not created in {} seconds" + ).format(timeout)) + time.sleep(0.1) + self.session = session if load_files: if not self.handler_paths: diff --git a/openpype/modules/ftrack/ftrack_server/lib.py b/openpype/modules/ftrack/ftrack_server/lib.py index 91f3712136..88f849e765 100644 --- a/openpype/modules/ftrack/ftrack_server/lib.py +++ b/openpype/modules/ftrack/ftrack_server/lib.py @@ -3,11 +3,11 @@ import sys import logging import getpass import atexit -import tempfile import threading import datetime import time import queue +import appdirs import pymongo import requests @@ -165,7 +165,6 @@ class ProcessEventHub(SocketBaseEventHub): def wait(self, duration=None): """Overriden wait - Event are loaded from Mongo DB when queue is empty. Handled event is set as processed in Mongo DB. """ @@ -252,7 +251,7 @@ class CustomEventHubSession(ftrack_api.session.Session): self, server_url=None, api_key=None, api_user=None, auto_populate=True, plugin_paths=None, cache=None, cache_key_maker=None, auto_connect_event_hub=False, schema_cache_path=None, - plugin_arguments=None, **kwargs + plugin_arguments=None, timeout=60, **kwargs ): self.kwargs = kwargs @@ -331,6 +330,7 @@ class CustomEventHubSession(ftrack_api.session.Session): self._request.auth = ftrack_api.session.SessionAuthentication( self._api_key, self._api_user ) + self.request_timeout = timeout self.auto_populate = auto_populate @@ -368,8 +368,9 @@ class CustomEventHubSession(ftrack_api.session.Session): # rebuilding types)? if schema_cache_path is not False: if schema_cache_path is None: + schema_cache_path = appdirs.user_cache_dir() schema_cache_path = os.environ.get( - 'FTRACK_API_SCHEMA_CACHE_PATH', tempfile.gettempdir() + 'FTRACK_API_SCHEMA_CACHE_PATH', schema_cache_path ) schema_cache_path = os.path.join( diff --git a/openpype/modules/ftrack/launch_hooks/pre_python2_vendor.py b/openpype/modules/ftrack/launch_hooks/pre_python2_vendor.py index 7826d833ac..f14857bc98 100644 --- a/openpype/modules/ftrack/launch_hooks/pre_python2_vendor.py +++ b/openpype/modules/ftrack/launch_hooks/pre_python2_vendor.py @@ -9,7 +9,7 @@ class PrePython2Support(PreLaunchHook): Path to vendor modules is added to the beggining of PYTHONPATH. """ # There will be needed more granular filtering in future - app_groups = ["maya", "nuke", "nukex", "hiero", "nukestudio"] + app_groups = ["maya", "nuke", "nukex", "hiero", "nukestudio", "unreal"] def execute(self): # Prepare vendor dir path diff --git a/openpype/modules/ftrack/lib/avalon_sync.py b/openpype/modules/ftrack/lib/avalon_sync.py index 7511c2627b..79e1366a0d 100644 --- a/openpype/modules/ftrack/lib/avalon_sync.py +++ b/openpype/modules/ftrack/lib/avalon_sync.py @@ -891,6 +891,33 @@ class SyncEntitiesFactory: self.entities_dict[parent_id]["children"].remove(id) + def _query_custom_attributes(self, session, conf_ids, entity_ids): + output = [] + # Prepare values to query + attributes_joined = join_query_keys(conf_ids) + attributes_len = len(conf_ids) + chunk_size = int(5000 / attributes_len) + for idx in range(0, len(entity_ids), chunk_size): + entity_ids_joined = join_query_keys( + entity_ids[idx:idx + chunk_size] + ) + + call_expr = [{ + "action": "query", + "expression": ( + "select value, entity_id from ContextCustomAttributeValue " + "where entity_id in ({}) and configuration_id in ({})" + ).format(entity_ids_joined, attributes_joined) + }] + if hasattr(session, "call"): + [result] = session.call(call_expr) + else: + [result] = session._call(call_expr) + + for item in result["data"]: + output.append(item) + return output + def set_cutom_attributes(self): self.log.debug("* Preparing custom attributes") # Get custom attributes and values @@ -1000,31 +1027,13 @@ class SyncEntitiesFactory: copy.deepcopy(prepared_avalon_attr_ca_id) ) - # TODO query custom attributes by entity_id - entity_ids_joined = ", ".join([ - "\"{}\"".format(id) for id in sync_ids - ]) - attributes_joined = ", ".join([ - "\"{}\"".format(attr_id) for attr_id in attribute_key_by_id.keys() - ]) - - cust_attr_query = ( - "select value, configuration_id, entity_id" - " from ContextCustomAttributeValue" - " where entity_id in ({}) and configuration_id in ({})" + items = self._query_custom_attributes( + self.session, + list(attribute_key_by_id.keys()), + sync_ids ) - call_expr = [{ - "action": "query", - "expression": cust_attr_query.format( - entity_ids_joined, attributes_joined - ) - }] - if hasattr(self.session, "call"): - [values] = self.session.call(call_expr) - else: - [values] = self.session._call(call_expr) - for item in values["data"]: + for item in items: entity_id = item["entity_id"] attr_id = item["configuration_id"] key = attribute_key_by_id[attr_id] @@ -1106,28 +1115,14 @@ class SyncEntitiesFactory: for key, val in prepare_dict_avalon.items(): entity_dict["avalon_attrs"][key] = val - # Prepare values to query - entity_ids_joined = ", ".join([ - "\"{}\"".format(id) for id in sync_ids - ]) - attributes_joined = ", ".join([ - "\"{}\"".format(attr_id) for attr_id in attribute_key_by_id.keys() - ]) - avalon_hier = [] - call_expr = [{ - "action": "query", - "expression": ( - "select value, entity_id, configuration_id" - " from ContextCustomAttributeValue" - " where entity_id in ({}) and configuration_id in ({})" - ).format(entity_ids_joined, attributes_joined) - }] - if hasattr(self.session, "call"): - [values] = self.session.call(call_expr) - else: - [values] = self.session._call(call_expr) + items = self._query_custom_attributes( + self.session, + list(attribute_key_by_id.keys()), + sync_ids + ) - for item in values["data"]: + avalon_hier = [] + for item in items: value = item["value"] # WARNING It is not possible to propage enumerate hierachical # attributes with multiselection 100% right. Unseting all values @@ -1256,19 +1251,21 @@ class SyncEntitiesFactory: if not msg or not items: continue self.report_items["warning"][msg] = items - tasks = {} - for task_type in task_types: - task_type_name = task_type["name"] - # Set short name to empty string - # QUESTION Maybe better would be to lower and remove spaces - # from task type name. - tasks[task_type_name] = { - "short_name": "" - } current_project_anatomy_data = get_anatomy_settings( project_name, exclude_locals=True ) + anatomy_tasks = current_project_anatomy_data["tasks"] + tasks = {} + default_type_data = { + "short_name": "" + } + for task_type in task_types: + task_type_name = task_type["name"] + tasks[task_type_name] = copy.deepcopy( + anatomy_tasks.get(task_type_name) + or default_type_data + ) project_config = { "tasks": tasks, diff --git a/openpype/modules/ftrack/lib/credentials.py b/openpype/modules/ftrack/lib/credentials.py index 16b1fb25fb..2d719347e7 100644 --- a/openpype/modules/ftrack/lib/credentials.py +++ b/openpype/modules/ftrack/lib/credentials.py @@ -1,23 +1,16 @@ import os -import json import ftrack_api -import appdirs -import getpass + try: from urllib.parse import urlparse except ImportError: from urlparse import urlparse -CONFIG_PATH = os.path.normpath(appdirs.user_data_dir("pype-app", "pype")) -CREDENTIALS_FILE_NAME = "ftrack_cred.json" -CREDENTIALS_PATH = os.path.join(CONFIG_PATH, CREDENTIALS_FILE_NAME) -CREDENTIALS_FOLDER = os.path.dirname(CREDENTIALS_PATH) +from openpype.lib import OpenPypeSecureRegistry -if not os.path.isdir(CREDENTIALS_FOLDER): - os.makedirs(CREDENTIALS_FOLDER) - -USER_GETTER = None +USERNAME_KEY = "username" +API_KEY_KEY = "api_key" def get_ftrack_hostname(ftrack_server=None): @@ -30,112 +23,73 @@ def get_ftrack_hostname(ftrack_server=None): return urlparse(ftrack_server).hostname -def get_user(): - if USER_GETTER: - return USER_GETTER() - return getpass.getuser() +def _get_ftrack_secure_key(hostname, key): + """Secure item key for entered hostname.""" + return "/".join(("ftrack", hostname, key)) -def get_credentials(ftrack_server=None, user=None): - credentials = {} - if not os.path.exists(CREDENTIALS_PATH): - with open(CREDENTIALS_PATH, "w") as file: - file.write(json.dumps(credentials)) - file.close() - return credentials - - with open(CREDENTIALS_PATH, "r") as file: - content = file.read() - +def get_credentials(ftrack_server=None): hostname = get_ftrack_hostname(ftrack_server) - if not user: - user = get_user() + username_name = _get_ftrack_secure_key(hostname, USERNAME_KEY) + api_key_name = _get_ftrack_secure_key(hostname, API_KEY_KEY) - content_json = json.loads(content or "{}") - credentials = content_json.get(hostname, {}).get(user) or {} + username_registry = OpenPypeSecureRegistry(username_name) + api_key_registry = OpenPypeSecureRegistry(api_key_name) - return credentials - - -def save_credentials(ft_user, ft_api_key, ftrack_server=None, user=None): - hostname = get_ftrack_hostname(ftrack_server) - if not user: - user = get_user() - - with open(CREDENTIALS_PATH, "r") as file: - content = file.read() - - content_json = json.loads(content or "{}") - if hostname not in content_json: - content_json[hostname] = {} - - content_json[hostname][user] = { - "username": ft_user, - "api_key": ft_api_key + return { + USERNAME_KEY: username_registry.get_item(USERNAME_KEY, None), + API_KEY_KEY: api_key_registry.get_item(API_KEY_KEY, None) } - # Deprecated keys - if "username" in content_json: - content_json.pop("username") - if "apiKey" in content_json: - content_json.pop("apiKey") - - with open(CREDENTIALS_PATH, "w") as file: - file.write(json.dumps(content_json, indent=4)) - - -def clear_credentials(ft_user=None, ftrack_server=None, user=None): - if not ft_user: - ft_user = os.environ.get("FTRACK_API_USER") - - if not ft_user: - return +def save_credentials(username, api_key, ftrack_server=None): hostname = get_ftrack_hostname(ftrack_server) - if not user: - user = get_user() + username_name = _get_ftrack_secure_key(hostname, USERNAME_KEY) + api_key_name = _get_ftrack_secure_key(hostname, API_KEY_KEY) - with open(CREDENTIALS_PATH, "r") as file: - content = file.read() + # Clear credentials + clear_credentials(ftrack_server) - content_json = json.loads(content or "{}") - if hostname not in content_json: - content_json[hostname] = {} + username_registry = OpenPypeSecureRegistry(username_name) + api_key_registry = OpenPypeSecureRegistry(api_key_name) - content_json[hostname].pop(user, None) - - with open(CREDENTIALS_PATH, "w") as file: - file.write(json.dumps(content_json)) + username_registry.set_item(USERNAME_KEY, username) + api_key_registry.set_item(API_KEY_KEY, api_key) -def set_env(ft_user=None, ft_api_key=None): - os.environ["FTRACK_API_USER"] = ft_user or "" - os.environ["FTRACK_API_KEY"] = ft_api_key or "" +def clear_credentials(ftrack_server=None): + hostname = get_ftrack_hostname(ftrack_server) + username_name = _get_ftrack_secure_key(hostname, USERNAME_KEY) + api_key_name = _get_ftrack_secure_key(hostname, API_KEY_KEY) + + username_registry = OpenPypeSecureRegistry(username_name) + api_key_registry = OpenPypeSecureRegistry(api_key_name) + + current_username = username_registry.get_item(USERNAME_KEY, None) + current_api_key = api_key_registry.get_item(API_KEY_KEY, None) + + if current_username is not None: + username_registry.delete_item(USERNAME_KEY) + + if current_api_key is not None: + api_key_registry.delete_item(API_KEY_KEY) -def get_env_credentials(): - return ( - os.environ.get("FTRACK_API_USER"), - os.environ.get("FTRACK_API_KEY") - ) - - -def check_credentials(ft_user, ft_api_key, ftrack_server=None): +def check_credentials(username, api_key, ftrack_server=None): if not ftrack_server: ftrack_server = os.environ["FTRACK_SERVER"] - if not ft_user or not ft_api_key: + if not username or not api_key: return False try: session = ftrack_api.Session( server_url=ftrack_server, - api_key=ft_api_key, - api_user=ft_user + api_key=api_key, + api_user=username ) session.close() except Exception: return False - return True diff --git a/openpype/modules/ftrack/lib/settings.py b/openpype/modules/ftrack/lib/settings.py index f6967411db..027356edc6 100644 --- a/openpype/modules/ftrack/lib/settings.py +++ b/openpype/modules/ftrack/lib/settings.py @@ -1,6 +1,7 @@ import os from openpype.api import get_system_settings + def get_ftrack_settings(): return get_system_settings()["modules"]["ftrack"] @@ -10,7 +11,6 @@ def get_ftrack_url_from_settings(): def get_ftrack_event_mongo_info(): - ftrack_settings = get_ftrack_settings() database_name = os.environ["OPENPYPE_DATABASE_NAME"] collection_name = "ftrack_events" return database_name, collection_name diff --git a/openpype/modules/ftrack/tray/ftrack_tray.py b/openpype/modules/ftrack/tray/ftrack_tray.py index 9da5db835b..ee27d8b730 100644 --- a/openpype/modules/ftrack/tray/ftrack_tray.py +++ b/openpype/modules/ftrack/tray/ftrack_tray.py @@ -30,7 +30,7 @@ class FtrackTrayWrapper: self.bool_action_thread_running = False self.bool_timer_event = False - self.widget_login = login_dialog.CredentialsDialog() + self.widget_login = login_dialog.CredentialsDialog(module) self.widget_login.login_changed.connect(self.on_login_change) self.widget_login.logout_signal.connect(self.on_logout) @@ -56,7 +56,7 @@ class FtrackTrayWrapper: validation = credentials.check_credentials(ft_user, ft_api_key) if validation: self.widget_login.set_credentials(ft_user, ft_api_key) - credentials.set_env(ft_user, ft_api_key) + self.module.set_credentials_to_env(ft_user, ft_api_key) log.info("Connected to Ftrack successfully") self.on_login_change() @@ -337,7 +337,7 @@ class FtrackTrayWrapper: def changed_user(self): self.stop_action_server() - credentials.set_env() + self.module.set_credentials_to_env(None, None) self.validate() def start_timer_manager(self, data): diff --git a/openpype/modules/ftrack/tray/login_dialog.py b/openpype/modules/ftrack/tray/login_dialog.py index ca409ebcaa..ce91c6d012 100644 --- a/openpype/modules/ftrack/tray/login_dialog.py +++ b/openpype/modules/ftrack/tray/login_dialog.py @@ -14,11 +14,13 @@ class CredentialsDialog(QtWidgets.QDialog): login_changed = QtCore.Signal() logout_signal = QtCore.Signal() - def __init__(self, parent=None): + def __init__(self, module, parent=None): super(CredentialsDialog, self).__init__(parent) self.setWindowTitle("OpenPype - Ftrack Login") + self._module = module + self._login_server_thread = None self._is_logged = False self._in_advance_mode = False @@ -268,7 +270,7 @@ class CredentialsDialog(QtWidgets.QDialog): verification = credentials.check_credentials(username, api_key) if verification: credentials.save_credentials(username, api_key, False) - credentials.set_env(username, api_key) + self._module.set_credentials_to_env(username, api_key) self.set_credentials(username, api_key) self.login_changed.emit() return verification diff --git a/openpype/modules/idle_manager/idle_module.py b/openpype/modules/idle_manager/idle_module.py index ddccf07f6a..c06dbed78c 100644 --- a/openpype/modules/idle_manager/idle_module.py +++ b/openpype/modules/idle_manager/idle_module.py @@ -40,8 +40,7 @@ class IdleManager(PypeModule, ITrayService): name = "idle_manager" def initialize(self, module_settings): - idle_man_settings = module_settings[self.name] - self.enabled = idle_man_settings["enabled"] + self.enabled = True self.time_callbacks = collections.defaultdict(list) self.idle_thread = None @@ -50,7 +49,8 @@ class IdleManager(PypeModule, ITrayService): return def tray_start(self): - self.start_thread() + if self.time_callbacks: + self.start_thread() def tray_exit(self): self.stop_thread() diff --git a/openpype/modules/sync_server/__init__.py b/openpype/modules/sync_server/__init__.py index 7123536fcf..a814f0db62 100644 --- a/openpype/modules/sync_server/__init__.py +++ b/openpype/modules/sync_server/__init__.py @@ -1,5 +1,5 @@ -from openpype.modules.sync_server.sync_server import SyncServer +from openpype.modules.sync_server.sync_server_module import SyncServerModule def tray_init(tray_widget, main_widget): - return SyncServer() + return SyncServerModule() diff --git a/openpype/modules/sync_server/providers/__init__.py b/openpype/modules/sync_server/providers/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openpype/modules/sync_server/providers/abstract_provider.py b/openpype/modules/sync_server/providers/abstract_provider.py index 001d4c4d50..a60595ba93 100644 --- a/openpype/modules/sync_server/providers/abstract_provider.py +++ b/openpype/modules/sync_server/providers/abstract_provider.py @@ -1,16 +1,23 @@ -from abc import ABCMeta, abstractmethod +import abc +import six +from openpype.api import Logger + +log = Logger().get_logger("SyncServer") -class AbstractProvider(metaclass=ABCMeta): +@six.add_metaclass(abc.ABCMeta) +class AbstractProvider: - def __init__(self, site_name, tree=None, presets=None): + def __init__(self, project_name, site_name, tree=None, presets=None): self.presets = None self.active = False self.site_name = site_name self.presets = presets - @abstractmethod + super(AbstractProvider, self).__init__() + + @abc.abstractmethod def is_active(self): """ Returns True if provider is activated, eg. has working credentials. @@ -18,36 +25,54 @@ class AbstractProvider(metaclass=ABCMeta): (boolean) """ - @abstractmethod - def upload_file(self, source_path, target_path, overwrite=True): + @abc.abstractmethod + def upload_file(self, source_path, path, + server, collection, file, representation, site, + overwrite=False): """ Copy file from 'source_path' to 'target_path' on provider. Use 'overwrite' boolean to rewrite existing file on provider Args: - source_path (string): absolute path on local system - target_path (string): absolute path on provider (GDrive etc.) - overwrite (boolean): True if overwite existing + source_path (string): + path (string): absolute path with or without name of the file + overwrite (boolean): replace existing file + + arguments for saving progress: + server (SyncServer): server instance to call update_db on + collection (str): name of collection + file (dict): info about uploaded file (matches structure from db) + representation (dict): complete repre containing 'file' + site (str): site name Returns: (string) file_id of created file, raises exception """ pass - @abstractmethod - def download_file(self, source_path, local_path, overwrite=True): + @abc.abstractmethod + def download_file(self, source_path, local_path, + server, collection, file, representation, site, + overwrite=False): """ Download file from provider into local system Args: source_path (string): absolute path on provider - local_path (string): absolute path on local - overwrite (bool): default set to True + local_path (string): absolute path with or without name of the file + overwrite (boolean): replace existing file + + arguments for saving progress: + server (SyncServer): server instance to call update_db on + collection (str): name of collection + file (dict): info about uploaded file (matches structure from db) + representation (dict): complete repre containing 'file' + site (str): site name Returns: None """ pass - @abstractmethod + @abc.abstractmethod def delete_file(self, path): """ Deletes file from 'path'. Expects path to specific file. @@ -60,7 +85,7 @@ class AbstractProvider(metaclass=ABCMeta): """ pass - @abstractmethod + @abc.abstractmethod def list_folder(self, folder_path): """ List all files and subfolders of particular path non-recursively. @@ -72,7 +97,7 @@ class AbstractProvider(metaclass=ABCMeta): """ pass - @abstractmethod + @abc.abstractmethod def create_folder(self, folder_path): """ Create all nonexistent folders and subfolders in 'path'. @@ -85,7 +110,7 @@ class AbstractProvider(metaclass=ABCMeta): """ pass - @abstractmethod + @abc.abstractmethod def get_tree(self): """ Creates folder structure for providers which do not provide @@ -94,16 +119,50 @@ class AbstractProvider(metaclass=ABCMeta): """ pass - @abstractmethod - def resolve_path(self, path, root_config, anatomy=None): + @abc.abstractmethod + def get_roots_config(self, anatomy=None): """ - Replaces root placeholders with appropriate real value from - 'root_configs' (from Settings or Local Settings) or Anatomy - (mainly for 'studio' site) + Returns root values for path resolving - Args: - path(string): path with '{root[work]}/...' - root_config(dict): from Settings or Local Settings - anatomy (Anatomy): prepared anatomy object for project + Takes value from Anatomy which takes values from Settings + overridden by Local Settings + + Returns: + (dict) - {"root": {"root": "/My Drive"}} + OR + {"root": {"root_ONE": "value", "root_TWO":"value}} + Format is importing for usage of python's format ** approach """ pass + + def resolve_path(self, path, root_config=None, anatomy=None): + """ + Replaces all root placeholders with proper values + + Args: + path(string): root[work]/folder... + root_config (dict): {'work': "c:/..."...} + anatomy (Anatomy): object of Anatomy + Returns: + (string): proper url + """ + if not root_config: + root_config = self.get_roots_config(anatomy) + + if root_config and not root_config.get("root"): + root_config = {"root": root_config} + + try: + if not root_config: + raise KeyError + + path = path.format(**root_config) + except KeyError: + try: + path = anatomy.fill_root(path) + except KeyError: + msg = "Error in resolving local root from anatomy" + log.error(msg) + raise ValueError(msg) + + return path diff --git a/openpype/modules/sync_server/providers/gdrive.py b/openpype/modules/sync_server/providers/gdrive.py index 6c01bc4e6f..f1ea24f601 100644 --- a/openpype/modules/sync_server/providers/gdrive.py +++ b/openpype/modules/sync_server/providers/gdrive.py @@ -10,6 +10,7 @@ from openpype.api import get_system_settings from ..utils import time_function import time + SCOPES = ['https://www.googleapis.com/auth/drive.metadata.readonly', 'https://www.googleapis.com/auth/drive.file', 'https://www.googleapis.com/auth/drive.readonly'] # for write|delete @@ -45,9 +46,10 @@ class GDriveHandler(AbstractProvider): MY_DRIVE_STR = 'My Drive' # name of root folder of regular Google drive CHUNK_SIZE = 2097152 # must be divisible by 256! - def __init__(self, site_name, tree=None, presets=None): + def __init__(self, project_name, site_name, tree=None, presets=None): self.presets = None self.active = False + self.project_name = project_name self.site_name = site_name self.presets = presets @@ -65,137 +67,6 @@ class GDriveHandler(AbstractProvider): self._tree = tree self.active = True - def _get_gd_service(self): - """ - Authorize client with 'credentials.json', uses service account. - Service account needs to have target folder shared with. - Produces service that communicates with GDrive API. - - Returns: - None - """ - creds = service_account.Credentials.from_service_account_file( - self.presets["credentials_url"], - scopes=SCOPES) - service = build('drive', 'v3', - credentials=creds, cache_discovery=False) - return service - - def _prepare_root_info(self): - """ - Prepare info about roots and theirs folder ids from 'presets'. - Configuration might be for single or multiroot projects. - Regular My Drive and Shared drives are implemented, their root - folder ids need to be queried in slightly different way. - - Returns: - (dicts) of dicts where root folders are keys - """ - roots = {} - for path in self.get_roots_config().values(): - if self.MY_DRIVE_STR in path: - roots[self.MY_DRIVE_STR] = self.service.files()\ - .get(fileId='root').execute() - else: - shared_drives = [] - page_token = None - - while True: - response = self.service.drives().list( - pageSize=100, - pageToken=page_token).execute() - shared_drives.extend(response.get('drives', [])) - page_token = response.get('nextPageToken', None) - if page_token is None: - break - - folders = path.split('/') - if len(folders) < 2: - raise ValueError("Wrong root folder definition {}". - format(path)) - - for shared_drive in shared_drives: - if folders[1] in shared_drive["name"]: - roots[shared_drive["name"]] = { - "name": shared_drive["name"], - "id": shared_drive["id"]} - if self.MY_DRIVE_STR not in roots: # add My Drive always - roots[self.MY_DRIVE_STR] = self.service.files() \ - .get(fileId='root').execute() - - return roots - - @time_function - def _build_tree(self, folders): - """ - Create in-memory structure resolving paths to folder id as - recursive querying might be slower. - Initialized in the time of class initialization. - Maybe should be persisted - Tree is structure of path to id: - '/ROOT': {'id': '1234567'} - '/ROOT/PROJECT_FOLDER': {'id':'222222'} - '/ROOT/PROJECT_FOLDER/Assets': {'id': '3434545'} - Args: - folders (list): list of dictionaries with folder metadata - Returns: - (dictionary) path as a key, folder id as a value - """ - log.debug("build_tree len {}".format(len(folders))) - root_ids = [] - default_root_id = None - tree = {} - ending_by = {} - for root_name, root in self.root.items(): # might be multiple roots - if root["id"] not in root_ids: - tree["/" + root_name] = {"id": root["id"]} - ending_by[root["id"]] = "/" + root_name - root_ids.append(root["id"]) - - if self.MY_DRIVE_STR == root_name: - default_root_id = root["id"] - - no_parents_yet = {} - while folders: - folder = folders.pop(0) - parents = folder.get("parents", []) - # weird cases, shared folders, etc, parent under root - if not parents: - parent = default_root_id - else: - parent = parents[0] - - if folder["id"] in root_ids: # do not process root - continue - - if parent in ending_by: - path_key = ending_by[parent] + "/" + folder["name"] - ending_by[folder["id"]] = path_key - tree[path_key] = {"id": folder["id"]} - else: - no_parents_yet.setdefault(parent, []).append((folder["id"], - folder["name"])) - loop_cnt = 0 - # break if looped more then X times - safety against infinite loop - while no_parents_yet and loop_cnt < 20: - - keys = list(no_parents_yet.keys()) - for parent in keys: - if parent in ending_by.keys(): - subfolders = no_parents_yet.pop(parent) - for folder_id, folder_name in subfolders: - path_key = ending_by[parent] + "/" + folder_name - ending_by[folder_id] = path_key - tree[path_key] = {"id": folder_id} - loop_cnt += 1 - - if len(no_parents_yet) > 0: - log.debug("Some folders path are not resolved {}". - format(no_parents_yet)) - log.debug("Remove deleted folders from trash.") - - return tree - def is_active(self): """ Returns True if provider is activated, eg. has working credentials. @@ -204,6 +75,21 @@ class GDriveHandler(AbstractProvider): """ return self.active + def get_roots_config(self, anatomy=None): + """ + Returns root values for path resolving + + Use only Settings as GDrive cannot be modified by Local Settings + + Returns: + (dict) - {"root": {"root": "/My Drive"}} + OR + {"root": {"root_ONE": "value", "root_TWO":"value}} + Format is importing for usage of python's format ** approach + """ + # GDrive roots cannot be locally overridden + return self.presets['root'] + def get_tree(self): """ Building of the folder tree could be potentially expensive, @@ -217,26 +103,6 @@ class GDriveHandler(AbstractProvider): self._tree = self._build_tree(self.list_folders()) return self._tree - def get_roots_config(self): - """ - Returns value from presets of roots. It calculates with multi - roots. Config should be simple key value, or dictionary. - - Examples: - "root": "/My Drive" - OR - "root": {"root_ONE": "value", "root_TWO":"value} - Returns: - (dict) - {"root": {"root": "/My Drive"}} - OR - {"root": {"root_ONE": "value", "root_TWO":"value}} - Format is importing for usage of python's format ** approach - """ - roots = self.presets["root"] - if isinstance(roots, str): - roots = {"root": roots} - return roots - def create_folder(self, path): """ Create all nonexistent folders and subfolders in 'path'. @@ -510,20 +376,6 @@ class GDriveHandler(AbstractProvider): self.service.files().delete(fileId=file["id"], supportsAllDrives=True).execute() - def _get_folder_metadata(self, path): - """ - Get info about folder with 'path' - Args: - path (string): - - Returns: - (dictionary) with metadata or raises ValueError - """ - try: - return self.get_tree()[path] - except Exception: - raise ValueError("Uknown folder id {}".format(id)) - def list_folder(self, folder_path): """ List all files and subfolders of particular path non-recursively. @@ -678,15 +530,151 @@ class GDriveHandler(AbstractProvider): return return provider_presets - def resolve_path(self, path, root_config, anatomy=None): - if not root_config.get("root"): - root_config = {"root": root_config} + def _get_gd_service(self): + """ + Authorize client with 'credentials.json', uses service account. + Service account needs to have target folder shared with. + Produces service that communicates with GDrive API. + Returns: + None + """ + creds = service_account.Credentials.from_service_account_file( + self.presets["credentials_url"], + scopes=SCOPES) + service = build('drive', 'v3', + credentials=creds, cache_discovery=False) + return service + + def _prepare_root_info(self): + """ + Prepare info about roots and theirs folder ids from 'presets'. + Configuration might be for single or multiroot projects. + Regular My Drive and Shared drives are implemented, their root + folder ids need to be queried in slightly different way. + + Returns: + (dicts) of dicts where root folders are keys + """ + roots = {} + config_roots = self.get_roots_config() + for path in config_roots.values(): + if self.MY_DRIVE_STR in path: + roots[self.MY_DRIVE_STR] = self.service.files()\ + .get(fileId='root').execute() + else: + shared_drives = [] + page_token = None + + while True: + response = self.service.drives().list( + pageSize=100, + pageToken=page_token).execute() + shared_drives.extend(response.get('drives', [])) + page_token = response.get('nextPageToken', None) + if page_token is None: + break + + folders = path.split('/') + if len(folders) < 2: + raise ValueError("Wrong root folder definition {}". + format(path)) + + for shared_drive in shared_drives: + if folders[1] in shared_drive["name"]: + roots[shared_drive["name"]] = { + "name": shared_drive["name"], + "id": shared_drive["id"]} + if self.MY_DRIVE_STR not in roots: # add My Drive always + roots[self.MY_DRIVE_STR] = self.service.files() \ + .get(fileId='root').execute() + + return roots + + @time_function + def _build_tree(self, folders): + """ + Create in-memory structure resolving paths to folder id as + recursive querying might be slower. + Initialized in the time of class initialization. + Maybe should be persisted + Tree is structure of path to id: + '/ROOT': {'id': '1234567'} + '/ROOT/PROJECT_FOLDER': {'id':'222222'} + '/ROOT/PROJECT_FOLDER/Assets': {'id': '3434545'} + Args: + folders (list): list of dictionaries with folder metadata + Returns: + (dictionary) path as a key, folder id as a value + """ + log.debug("build_tree len {}".format(len(folders))) + root_ids = [] + default_root_id = None + tree = {} + ending_by = {} + for root_name, root in self.root.items(): # might be multiple roots + if root["id"] not in root_ids: + tree["/" + root_name] = {"id": root["id"]} + ending_by[root["id"]] = "/" + root_name + root_ids.append(root["id"]) + + if self.MY_DRIVE_STR == root_name: + default_root_id = root["id"] + + no_parents_yet = {} + while folders: + folder = folders.pop(0) + parents = folder.get("parents", []) + # weird cases, shared folders, etc, parent under root + if not parents: + parent = default_root_id + else: + parent = parents[0] + + if folder["id"] in root_ids: # do not process root + continue + + if parent in ending_by: + path_key = ending_by[parent] + "/" + folder["name"] + ending_by[folder["id"]] = path_key + tree[path_key] = {"id": folder["id"]} + else: + no_parents_yet.setdefault(parent, []).append((folder["id"], + folder["name"])) + loop_cnt = 0 + # break if looped more then X times - safety against infinite loop + while no_parents_yet and loop_cnt < 20: + + keys = list(no_parents_yet.keys()) + for parent in keys: + if parent in ending_by.keys(): + subfolders = no_parents_yet.pop(parent) + for folder_id, folder_name in subfolders: + path_key = ending_by[parent] + "/" + folder_name + ending_by[folder_id] = path_key + tree[path_key] = {"id": folder_id} + loop_cnt += 1 + + if len(no_parents_yet) > 0: + log.debug("Some folders path are not resolved {}". + format(no_parents_yet)) + log.debug("Remove deleted folders from trash.") + + return tree + + def _get_folder_metadata(self, path): + """ + Get info about folder with 'path' + Args: + path (string): + + Returns: + (dictionary) with metadata or raises ValueError + """ try: - return path.format(**root_config) - except KeyError: - msg = "Error in resolving remote root, unknown key" - log.error(msg) + return self.get_tree()[path] + except Exception: + raise ValueError("Uknown folder id {}".format(id)) def _handle_q(self, q, trashed=False): """ API list call contain trashed and hidden files/folder by default. diff --git a/openpype/modules/sync_server/providers/lib.py b/openpype/modules/sync_server/providers/lib.py index 144594ecbe..58947e115d 100644 --- a/openpype/modules/sync_server/providers/lib.py +++ b/openpype/modules/sync_server/providers/lib.py @@ -1,4 +1,3 @@ -from enum import Enum from .gdrive import GDriveHandler from .local_drive import LocalDriveHandler @@ -25,7 +24,8 @@ class ProviderFactory: """ self.providers[provider] = (creator, batch_limit) - def get_provider(self, provider, site_name, tree=None, presets=None): + def get_provider(self, provider, project_name, site_name, + tree=None, presets=None): """ Returns new instance of provider client for specific site. One provider could have multiple sites. @@ -37,6 +37,7 @@ class ProviderFactory: provider (string): 'gdrive','S3' site_name (string): descriptor of site, different service accounts must have different site name + project_name (string): different projects could have diff. sites tree (dictionary): - folder paths to folder id structure presets (dictionary): config for provider and site (eg. "credentials_url"..) @@ -44,7 +45,8 @@ class ProviderFactory: (implementation of AbstractProvider) """ creator_info = self._get_creator_info(provider) - site = creator_info[0](site_name, tree, presets) # call init + # call init + site = creator_info[0](project_name, site_name, tree, presets) return site diff --git a/openpype/modules/sync_server/providers/local_drive.py b/openpype/modules/sync_server/providers/local_drive.py index fa8dd4c183..1f4fca80eb 100644 --- a/openpype/modules/sync_server/providers/local_drive.py +++ b/openpype/modules/sync_server/providers/local_drive.py @@ -4,7 +4,7 @@ import shutil import threading import time -from openpype.api import Logger +from openpype.api import Logger, Anatomy from .abstract_provider import AbstractProvider log = Logger().get_logger("SyncServer") @@ -12,6 +12,14 @@ log = Logger().get_logger("SyncServer") class LocalDriveHandler(AbstractProvider): """ Handles required operations on mounted disks with OS """ + def __init__(self, project_name, site_name, tree=None, presets=None): + self.presets = None + self.active = False + self.project_name = project_name + self.site_name = site_name + + self.active = self.is_active() + def is_active(self): return True @@ -82,27 +90,37 @@ class LocalDriveHandler(AbstractProvider): os.makedirs(folder_path, exist_ok=True) return folder_path + def get_roots_config(self, anatomy=None): + """ + Returns root values for path resolving + + Takes value from Anatomy which takes values from Settings + overridden by Local Settings + + Returns: + (dict) - {"root": {"root": "/My Drive"}} + OR + {"root": {"root_ONE": "value", "root_TWO":"value}} + Format is importing for usage of python's format ** approach + """ + if not anatomy: + anatomy = Anatomy(self.project_name, + self._normalize_site_name(self.site_name)) + + return {'root': anatomy.roots} + def get_tree(self): return - def resolve_path(self, path, root_config, anatomy=None): - if root_config and not root_config.get("root"): - root_config = {"root": root_config} + def get_configurable_items_for_site(self): + """ + Returns list of items that should be configurable by User - try: - if not root_config: - raise KeyError - - path = path.format(**root_config) - except KeyError: - try: - path = anatomy.fill_root(path) - except KeyError: - msg = "Error in resolving local root from anatomy" - log.error(msg) - raise ValueError(msg) - - return path + Returns: + (list of dict) + [{key:"root", label:"root", value:"valueFromSettings"}] + """ + pass def _copy(self, source_path, target_path): print("copying {}->{}".format(source_path, target_path)) @@ -133,3 +151,9 @@ class LocalDriveHandler(AbstractProvider): ) target_file_size = os.path.getsize(target_path) time.sleep(0.5) + + def _normalize_site_name(self, site_name): + """Transform user id to 'local' for Local settings""" + if site_name != 'studio': + return 'local' + return site_name diff --git a/openpype/modules/sync_server/sync_server.py b/openpype/modules/sync_server/sync_server.py index 62a5dc675c..e97c0e8844 100644 --- a/openpype/modules/sync_server/sync_server.py +++ b/openpype/modules/sync_server/sync_server.py @@ -1,1391 +1,225 @@ -from openpype.api import ( - Anatomy, - get_project_settings, - get_local_site_id) - +"""Python 3 only implementation.""" +import os +import asyncio import threading import concurrent.futures from concurrent.futures._base import CancelledError -from enum import Enum -from datetime import datetime - from .providers import lib -import os -from bson.objectid import ObjectId - -from avalon.api import AvalonMongoDB -from .utils import time_function - -import six from openpype.lib import PypeLogger -from .. import PypeModule, ITrayModule -from .providers.local_drive import LocalDriveHandler -if six.PY2: - web = asyncio = STATIC_DIR = WebSocketAsync = None -else: - import asyncio +from .utils import SyncStatus + log = PypeLogger().get_logger("SyncServer") -class SyncStatus(Enum): - DO_NOTHING = 0 - DO_UPLOAD = 1 - DO_DOWNLOAD = 2 - - -class SyncServer(PypeModule, ITrayModule): +async def upload(module, collection, file, representation, provider_name, + remote_site_name, tree=None, preset=None): """ - Synchronization server that is syncing published files from local to - any of implemented providers (like GDrive, S3 etc.) - Runs in the background and checks all representations, looks for files - that are marked to be in different location than 'studio' (temporary), - checks if 'created_dt' field is present denoting successful sync - with provider destination. - Sites structure is created during publish OR by calling 'add_site' - method. + Upload single 'file' of a 'representation' to 'provider'. + Source url is taken from 'file' portion, where {root} placeholder + is replaced by 'representation.Context.root' + Provider could be one of implemented in provider.py. - By default it will always contain 1 record with - "name" == self.presets["active_site"] and - filled "created_dt" AND 1 or multiple records for all defined - remote sites, where "created_dt" is not present. - This highlights that file should be uploaded to - remote destination + Updates MongoDB, fills in id of file from provider (ie. file_id + from GDrive), 'created_dt' - time of upload - ''' - example of synced file test_Cylinder_lookMain_v010.ma to GDrive - "files" : [ - { - "path" : "{root}/Test/Assets/Cylinder/publish/look/lookMain/v010/ - test_Cylinder_lookMain_v010.ma", - "_id" : ObjectId("5eeb25e411e06a16209ab78f"), - "hash" : "test_Cylinder_lookMain_v010,ma|1592468963,24|4822", - "size" : NumberLong(4822), - "sites" : [ - { - "name": "john_local_XD4345", - "created_dt" : ISODate("2020-05-22T08:05:44.000Z") - }, - { - "id" : ObjectId("5eeb25e411e06a16209ab78f"), - "name": "gdrive", - "created_dt" : ISODate("2020-05-55T08:54:35.833Z") - ] - } - }, - ''' - Each Tray app has assigned its own self.presets["local_id"] - used in sites as a name. - Tray is searching only for records where name matches its - self.presets["active_site"] + self.presets["remote_site"]. - "active_site" could be storage in studio ('studio'), or specific - "local_id" when user is working disconnected from home. - If the local record has its "created_dt" filled, it is a source and - process will try to upload the file to all defined remote sites. + 'provider_name' doesn't have to match to 'site_name', single + provider (GDrive) might have multiple sites ('projectA', + 'projectB') - Remote files "id" is real id that could be used in appropriate API. - Local files have "id" too, for conformity, contains just file name. - It is expected that multiple providers will be implemented in separate - classes and registered in 'providers.py'. + Args: + module(SyncServerModule): object to run SyncServerModule API + collection (str): source collection + file (dictionary): of file from representation in Mongo + representation (dictionary): of representation + provider_name (string): gdrive, gdc etc. + site_name (string): site on provider, single provider(gdrive) could + have multiple sites (different accounts, credentials) + tree (dictionary): injected memory structure for performance + preset (dictionary): site config ('credentials_url', 'root'...) """ - # limit querying DB to look for X number of representations that should - # be sync, we try to run more loops with less records - # actual number of files synced could be lower as providers can have - # different limits imposed by its API - # set 0 to no limit - REPRESENTATION_LIMIT = 100 - DEFAULT_SITE = 'studio' - LOCAL_SITE = 'local' - LOG_PROGRESS_SEC = 5 # how often log progress to DB + # create ids sequentially, upload file in parallel later + with module.lock: + # this part modifies structure on 'remote_site', only single + # thread can do that at a time, upload/download to prepared + # structure should be run in parallel + remote_handler = lib.factory.get_provider(provider_name, + collection, + remote_site_name, + tree=tree, + presets=preset) - name = "sync_server" - label = "Sync Server" - - def initialize(self, module_settings): - """ - Called during Module Manager creation. - - Collects needed data, checks asyncio presence. - Sets 'enabled' according to global settings for the module. - Shouldnt be doing any initialization, thats a job for 'tray_init' - """ - self.enabled = module_settings[self.name]["enabled"] - if asyncio is None: - raise AssertionError( - "SyncServer module requires Python 3.5 or higher." + file_path = file.get("path", "") + try: + local_file_path, remote_file_path = resolve_paths(module, + file_path, collection, remote_site_name, remote_handler ) - # some parts of code need to run sequentially, not in async - self.lock = None - self.connection = None # connection to avalon DB to update state - # settings for all enabled projects for sync - self.sync_project_settings = None - self.sync_server_thread = None # asyncio requires new thread - - self.action_show_widget = None - self._paused = False - self._paused_projects = set() - self._paused_representations = set() - self._anatomies = {} - - """ Start of Public API """ - def add_site(self, collection, representation_id, site_name=None): - """ - Adds new site to representation to be synced. - - 'collection' must have synchronization enabled (globally or - project only) - - Used as a API endpoint from outside applications (Loader etc) - - Args: - collection (string): project name (must match DB) - representation_id (string): MongoDB _id value - site_name (string): name of configured and active site - - Returns: - throws ValueError if any issue - """ - if not self.get_sync_project_setting(collection): - raise ValueError("Project not configured") - - if not site_name: - site_name = self.DEFAULT_SITE - - self.reset_provider_for_file(collection, - representation_id, - site_name=site_name) - - # public facing API - def remove_site(self, collection, representation_id, site_name, - remove_local_files=False): - """ - Removes 'site_name' for particular 'representation_id' on - 'collection' - - Args: - collection (string): project name (must match DB) - representation_id (string): MongoDB _id value - site_name (string): name of configured and active site - remove_local_files (bool): remove only files for 'local_id' - site - - Returns: - throws ValueError if any issue - """ - if not self.get_sync_project_setting(collection): - raise ValueError("Project not configured") - - self.reset_provider_for_file(collection, - representation_id, - site_name=site_name, - remove=True) - if remove_local_files: - self._remove_local_file(collection, representation_id, site_name) - - def clear_project(self, collection, site_name): - """ - Clear 'collection' of 'site_name' and its local files - - Works only on real local sites, not on 'studio' - """ - query = { - "type": "representation", - "files.sites.name": site_name - } - - representations = list( - self.connection.database[collection].find(query)) - if not representations: - self.log.debug("No repre found") - return - - for repre in representations: - self.remove_site(collection, repre.get("_id"), site_name, True) - - def pause_representation(self, collection, representation_id, site_name): - """ - Sets 'representation_id' as paused, eg. no syncing should be - happening on it. - - Args: - collection (string): project name - representation_id (string): MongoDB objectId value - site_name (string): 'gdrive', 'studio' etc. - """ - log.info("Pausing SyncServer for {}".format(representation_id)) - self._paused_representations.add(representation_id) - self.reset_provider_for_file(collection, representation_id, - site_name=site_name, pause=True) - - def unpause_representation(self, collection, representation_id, site_name): - """ - Sets 'representation_id' as unpaused. - - Does not fail or warn if repre wasn't paused. - - Args: - collection (string): project name - representation_id (string): MongoDB objectId value - site_name (string): 'gdrive', 'studio' etc. - """ - log.info("Unpausing SyncServer for {}".format(representation_id)) - try: - self._paused_representations.remove(representation_id) - except KeyError: - pass - # self.paused_representations is not persistent - self.reset_provider_for_file(collection, representation_id, - site_name=site_name, pause=False) - - def is_representation_paused(self, representation_id, - check_parents=False, project_name=None): - """ - Returns if 'representation_id' is paused or not. - - Args: - representation_id (string): MongoDB objectId value - check_parents (bool): check if parent project or server itself - are not paused - project_name (string): project to check if paused - - if 'check_parents', 'project_name' should be set too - Returns: - (bool) - """ - condition = representation_id in self._paused_representations - if check_parents and project_name: - condition = condition or \ - self.is_project_paused(project_name) or \ - self.is_paused() - return condition - - def pause_project(self, project_name): - """ - Sets 'project_name' as paused, eg. no syncing should be - happening on all representation inside. - - Args: - project_name (string): collection name - """ - log.info("Pausing SyncServer for {}".format(project_name)) - self._paused_projects.add(project_name) - - def unpause_project(self, project_name): - """ - Sets 'project_name' as unpaused - - Does not fail or warn if project wasn't paused. - - Args: - project_name (string): collection name - """ - log.info("Unpausing SyncServer for {}".format(project_name)) - try: - self._paused_projects.remove(project_name) - except KeyError: - pass - - def is_project_paused(self, project_name, check_parents=False): - """ - Returns if 'project_name' is paused or not. - - Args: - project_name (string): collection name - check_parents (bool): check if server itself - is not paused - Returns: - (bool) - """ - condition = project_name in self._paused_projects - if check_parents: - condition = condition or self.is_paused() - return condition - - def pause_server(self): - """ - Pause sync server - - It won't check anything, not uploading/downloading... - """ - log.info("Pausing SyncServer") - self._paused = True - - def unpause_server(self): - """ - Unpause server - """ - log.info("Unpausing SyncServer") - self._paused = False - - def is_paused(self): - """ Is server paused """ - return self._paused - - def get_active_sites(self, project_name): - """ - Returns list of active sites for 'project_name'. - - By default it returns ['studio'], this site is default - and always present even if SyncServer is not enabled. (for publish) - - Used mainly for Local settings for user override. - - Args: - project_name (string): - - Returns: - (list) of strings - """ - return self.get_active_sites_from_settings( - get_project_settings(project_name)) - - def get_active_sites_from_settings(self, settings): - """ - List available active sites from incoming 'settings'. Used for - returning 'default' values for Local Settings - - Args: - settings (dict): full settings (global + project) - Returns: - (list) of strings - """ - sync_settings = self._parse_sync_settings_from_settings(settings) - - return self._get_active_sites_from_settings(sync_settings) - - def get_active_site(self, project_name): - """ - Returns active (mine) site for 'project_name' from settings - - Returns: - (string) - """ - active_site = self.get_sync_project_setting( - project_name)['config']['active_site'] - if active_site == self.LOCAL_SITE: - return get_local_site_id() - return active_site - - # remote sites - def get_remote_sites(self, project_name): - """ - Returns all remote sites configured on 'project_name'. - - If 'project_name' is not enabled for syncing returns []. - - Used by Local setting to allow user choose remote site. - - Args: - project_name (string): - - Returns: - (list) of strings - """ - return self.get_remote_sites_from_settings( - get_project_settings(project_name)) - - def get_remote_sites_from_settings(self, settings): - """ - Get remote sites for returning 'default' values for Local Settings - """ - sync_settings = self._parse_sync_settings_from_settings(settings) - - return self._get_remote_sites_from_settings(sync_settings) - - def get_remote_site(self, project_name): - """ - Returns remote (theirs) site for 'project_name' from settings - """ - remote_site = self.get_sync_project_setting( - project_name)['config']['remote_site'] - if remote_site == self.LOCAL_SITE: - return get_local_site_id() - - return remote_site - - """ End of Public API """ - - def get_local_file_path(self, collection, file_path): - """ - Externalized for app - """ - local_file_path, _ = self._resolve_paths(file_path, collection) - - return local_file_path - - def _get_remote_sites_from_settings(self, sync_settings): - if not self.enabled or not sync_settings['enabled']: - return [] - - remote_sites = [self.DEFAULT_SITE, self.LOCAL_SITE] - if sync_settings: - remote_sites.extend(sync_settings.get("sites").keys()) - - return list(set(remote_sites)) - - def _get_active_sites_from_settings(self, sync_settings): - sites = [self.DEFAULT_SITE] - if self.enabled and sync_settings['enabled']: - sites.append(self.LOCAL_SITE) - - return sites - - def connect_with_modules(self, *_a, **kw): - return - - def tray_init(self): - """ - Actual initialization of Sync Server. - - Called when tray is initialized, it checks if module should be - enabled. If not, no initialization necessary. - """ - if not self.enabled: - return - - self.sync_project_settings = None - self.lock = threading.Lock() - - self.connection = AvalonMongoDB() - self.connection.install() - - try: - self.set_sync_project_settings() - self.sync_server_thread = SyncServerThread(self) - from .tray.app import SyncServerWindow - self.widget = SyncServerWindow(self) - except ValueError: - log.info("No system setting for sync. Not syncing.", exc_info=True) - self.enabled = False - except KeyError: - log.info(( - "There are not set presets for SyncServer OR " - "Credentials provided are invalid, " - "no syncing possible"). - format(str(self.sync_project_settings)), exc_info=True) - self.enabled = False - - def tray_start(self): - """ - Triggered when Tray is started. - - Checks if configuration presets are available and if there is - any provider ('gdrive', 'S3') that is activated - (eg. has valid credentials). + except Exception as exp: + print(exp) + + target_folder = os.path.dirname(remote_file_path) + folder_id = remote_handler.create_folder(target_folder) + + if not folder_id: + err = "Folder {} wasn't created. Check permissions.". \ + format(target_folder) + raise NotADirectoryError(err) + + loop = asyncio.get_running_loop() + file_id = await loop.run_in_executor(None, + remote_handler.upload_file, + local_file_path, + remote_file_path, + module, + collection, + file, + representation, + remote_site_name, + True + ) + return file_id + + +async def download(module, collection, file, representation, provider_name, + remote_site_name, tree=None, preset=None): + """ + Downloads file to local folder denoted in representation.Context. + + Args: + module(SyncServerModule): object to run SyncServerModule API + collection (str): source collection + file (dictionary) : info about processed file + representation (dictionary): repr that 'file' belongs to + provider_name (string): 'gdrive' etc + site_name (string): site on provider, single provider(gdrive) could + have multiple sites (different accounts, credentials) + tree (dictionary): injected memory structure for performance + preset (dictionary): site config ('credentials_url', 'root'...) Returns: - None - """ - if self.sync_project_settings and self.enabled: - self.sync_server_thread.start() - else: - log.info("No presets or active providers. " + - "Synchronization not possible.") + (string) - 'name' of local file + """ + with module.lock: + remote_handler = lib.factory.get_provider(provider_name, + collection, + remote_site_name, + tree=tree, + presets=preset) - def tray_exit(self): - """ - Stops sync thread if running. + file_path = file.get("path", "") + local_file_path, remote_file_path = resolve_paths( + module, file_path, collection, remote_site_name, remote_handler + ) - Called from Module Manager - """ - if not self.sync_server_thread: - return + local_folder = os.path.dirname(local_file_path) + os.makedirs(local_folder, exist_ok=True) - if not self.is_running: - return - try: - log.info("Stopping sync server server") - self.sync_server_thread.is_running = False - self.sync_server_thread.stop() - except Exception: - log.warning( - "Error has happened during Killing sync server", - exc_info=True - ) + local_site = module.get_active_site(collection) - def tray_menu(self, parent_menu): - if not self.enabled: - return + loop = asyncio.get_running_loop() + file_id = await loop.run_in_executor(None, + remote_handler.download_file, + remote_file_path, + local_file_path, + module, + collection, + file, + representation, + local_site, + True + ) + return file_id - from Qt import QtWidgets - """Add menu or action to Tray(or parent)'s menu""" - action = QtWidgets.QAction("SyncServer", parent_menu) - action.triggered.connect(self.show_widget) - parent_menu.addAction(action) - parent_menu.addSeparator() - self.action_show_widget = action +def resolve_paths(module, file_path, collection, + remote_site_name=None, remote_handler=None): + """ + Returns tuple of local and remote file paths with {root} + placeholders replaced with proper values from Settings or Anatomy - @property - def is_running(self): - return self.sync_server_thread.is_running + Ejected here because of Python 2 hosts (GDriveHandler is an issue) - def get_anatomy(self, project_name): - """ - Get already created or newly created anatomy for project - - Args: - project_name (string): - - Return: - (Anatomy) - """ - return self._anatomies.get('project_name') or Anatomy(project_name) - - def set_sync_project_settings(self): - """ - Set sync_project_settings for all projects (caching) - - For performance - """ - sync_project_settings = {} - if not self.connection: - self.connection = AvalonMongoDB() - self.connection.install() - - for collection in self.connection.database.collection_names(False): - sync_settings = self._parse_sync_settings_from_settings( - get_project_settings(collection)) - if sync_settings: - default_sites = self._get_default_site_configs() - sync_settings['sites'].update(default_sites) - sync_project_settings[collection] = sync_settings - - if not sync_project_settings: - log.info("No enabled and configured projects for sync.") - - self.sync_project_settings = sync_project_settings - - def get_sync_project_settings(self, refresh=False): - """ - Collects all projects which have enabled syncing and their settings Args: - refresh (bool): refresh presets from settings - used when user - changes site in Local Settings or any time up-to-date values - are necessary + module(SyncServerModule): object to run SyncServerModule API + file_path(string): path with {root} + collection(string): project name + remote_site_name(string): remote site + remote_handler(AbstractProvider): implementation Returns: - (dict): of settings, keys are project names - {'projectA':{enabled: True, sites:{}...} - """ - # presets set already, do not call again and again - if refresh or not self.sync_project_settings: - self.set_sync_project_settings() + (string, string) - proper absolute paths, remote path is optional + """ + remote_file_path = '' + if remote_handler: + remote_file_path = remote_handler.resolve_path(file_path) - return self.sync_project_settings + local_handler = lib.factory.get_provider( + 'local_drive', collection, module.get_active_site(collection)) + local_file_path = local_handler.resolve_path(file_path) - def get_sync_project_setting(self, project_name): - """ Handles pulling sync_server's settings for enabled 'project_name' + return local_file_path, remote_file_path - Args: - project_name (str): used in project settings - Returns: - (dict): settings dictionary for the enabled project, - empty if no settings or sync is disabled - """ - # presets set already, do not call again and again - # self.log.debug("project preset {}".format(self.presets)) - if self.sync_project_settings and \ - self.sync_project_settings.get(project_name): - return self.sync_project_settings.get(project_name) - settings = get_project_settings(project_name) - return self._parse_sync_settings_from_settings(settings) +def site_is_working(module, project_name, site_name): + """ + Confirm that 'site_name' is configured correctly for 'project_name'. - def site_is_working(self, project_name, site_name): - """ - Confirm that 'site_name' is configured correctly for 'project_name' - Args: - project_name(string): - site_name(string): - Returns - (bool) - """ - if self._get_configured_sites(project_name).get(site_name): - return True - return False + Must be here as lib.factory access doesn't work in Python 2 hosts. - def _parse_sync_settings_from_settings(self, settings): - """ settings from api.get_project_settings, TOOD rename """ - sync_settings = settings.get("global").get("sync_server") - if not sync_settings: - log.info("No project setting not syncing.") - return {} - if sync_settings.get("enabled"): - return sync_settings + Args: + module (SyncServerModule) + project_name(string): + site_name(string): + Returns + (bool) + """ + if _get_configured_sites(module, project_name).get(site_name): + return True + return False + +def _get_configured_sites(module, project_name): + """ + Loops through settings and looks for configured sites and checks + its handlers for particular 'project_name'. + + Args: + project_setting(dict): dictionary from Settings + only_project_name(string, optional): only interested in + particular project + Returns: + (dict of dict) + {'ProjectA': {'studio':True, 'gdrive':False}} + """ + settings = module.get_sync_project_setting(project_name) + return _get_configured_sites_from_setting(module, project_name, settings) + + +def _get_configured_sites_from_setting(module, project_name, project_setting): + if not project_setting.get("enabled"): return {} - def _get_configured_sites(self, project_name): - """ - Loops through settings and looks for configured sites and checks - its handlers for particular 'project_name'. - - Args: - project_setting(dict): dictionary from Settings - only_project_name(string, optional): only interested in - particular project - Returns: - (dict of dict) - {'ProjectA': {'studio':True, 'gdrive':False}} - """ - settings = self.get_sync_project_setting(project_name) - return self._get_configured_sites_from_setting(settings) - - def _get_configured_sites_from_setting(self, project_setting): - if not project_setting.get("enabled"): - return {} - - initiated_handlers = {} - configured_sites = {} - all_sites = self._get_default_site_configs() - all_sites.update(project_setting.get("sites")) - for site_name, config in all_sites.items(): - handler = initiated_handlers. \ - get((config["provider"], site_name)) - if not handler: - handler = lib.factory.get_provider(config["provider"], - site_name, - presets=config) - initiated_handlers[(config["provider"], site_name)] = \ - handler - - if handler.is_active(): - configured_sites[site_name] = True - - return configured_sites - - def _get_default_site_configs(self): - """ - Returns skeleton settings for 'studio' and user's local site - """ - default_config = {'provider': 'local_drive'} - all_sites = {self.DEFAULT_SITE: default_config, - get_local_site_id(): default_config} - return all_sites - - def get_provider_for_site(self, project_name, site): - """ - Return provider name for site. - """ - site_preset = self.get_sync_project_setting(project_name)["sites"].\ - get(site) - if site_preset: - return site_preset["provider"] - - return "NA" - - @time_function - def get_sync_representations(self, collection, active_site, remote_site): - """ - Get representations that should be synced, these could be - recognised by presence of document in 'files.sites', where key is - a provider (GDrive, S3) and value is empty document or document - without 'created_dt' field. (Don't put null to 'created_dt'!). - - Querying of 'to-be-synched' files is offloaded to Mongod for - better performance. Goal is to get as few representations as - possible. - Args: - collection (string): name of collection (in most cases matches - project name - active_site (string): identifier of current active site (could be - 'local_0' when working from home, 'studio' when working in the - studio (default) - remote_site (string): identifier of remote site I want to sync to - - Returns: - (list) of dictionaries - """ - log.debug("Check representations for : {}".format(collection)) - self.connection.Session["AVALON_PROJECT"] = collection - # retry_cnt - number of attempts to sync specific file before giving up - retries_arr = self._get_retries_arr(collection) - query = { - "type": "representation", - "$or": [ - {"$and": [ - { - "files.sites": { - "$elemMatch": { - "name": active_site, - "created_dt": {"$exists": True} - } - }}, { - "files.sites": { - "$elemMatch": { - "name": {"$in": [remote_site]}, - "created_dt": {"$exists": False}, - "tries": {"$in": retries_arr} - } - } - }]}, - {"$and": [ - { - "files.sites": { - "$elemMatch": { - "name": active_site, - "created_dt": {"$exists": False}, - "tries": {"$in": retries_arr} - } - }}, { - "files.sites": { - "$elemMatch": { - "name": {"$in": [remote_site]}, - "created_dt": {"$exists": True} - } - } - } - ]} - ] - } - log.debug("active_site:{} - remote_site:{}".format(active_site, - remote_site)) - log.debug("query: {}".format(query)) - representations = self.connection.find(query) - - return representations - - def check_status(self, file, local_site, remote_site, config_preset): - """ - Check synchronization status for single 'file' of single - 'representation' by single 'provider'. - (Eg. check if 'scene.ma' of lookdev.v10 should be synced to GDrive - - Always is comparing local record, eg. site with - 'name' == self.presets[PROJECT_NAME]['config']["active_site"] - - Args: - file (dictionary): of file from representation in Mongo - local_site (string): - local side of compare (usually 'studio') - remote_site (string): - gdrive etc. - config_preset (dict): config about active site, retries - Returns: - (string) - one of SyncStatus - """ - sites = file.get("sites") or [] - # if isinstance(sites, list): # temporary, old format of 'sites' - # return SyncStatus.DO_NOTHING - _, remote_rec = self._get_site_rec(sites, remote_site) or {} - if remote_rec: # sync remote target - created_dt = remote_rec.get("created_dt") - if not created_dt: - tries = self._get_tries_count_from_rec(remote_rec) - # file will be skipped if unsuccessfully tried over threshold - # error metadata needs to be purged manually in DB to reset - if tries < int(config_preset["retry_cnt"]): - return SyncStatus.DO_UPLOAD - else: - _, local_rec = self._get_site_rec(sites, local_site) or {} - if not local_rec or not local_rec.get("created_dt"): - tries = self._get_tries_count_from_rec(local_rec) - # file will be skipped if unsuccessfully tried over - # threshold times, error metadata needs to be purged - # manually in DB to reset - if tries < int(config_preset["retry_cnt"]): - return SyncStatus.DO_DOWNLOAD - - return SyncStatus.DO_NOTHING - - async def upload(self, collection, file, representation, provider_name, - remote_site_name, tree=None, preset=None): - """ - Upload single 'file' of a 'representation' to 'provider'. - Source url is taken from 'file' portion, where {root} placeholder - is replaced by 'representation.Context.root' - Provider could be one of implemented in provider.py. - - Updates MongoDB, fills in id of file from provider (ie. file_id - from GDrive), 'created_dt' - time of upload - - 'provider_name' doesn't have to match to 'site_name', single - provider (GDrive) might have multiple sites ('projectA', - 'projectB') - - Args: - collection (str): source collection - file (dictionary): of file from representation in Mongo - representation (dictionary): of representation - provider_name (string): gdrive, gdc etc. - site_name (string): site on provider, single provider(gdrive) could - have multiple sites (different accounts, credentials) - tree (dictionary): injected memory structure for performance - preset (dictionary): site config ('credentials_url', 'root'...) - - """ - # create ids sequentially, upload file in parallel later - with self.lock: - # this part modifies structure on 'remote_site', only single - # thread can do that at a time, upload/download to prepared - # structure should be run in parallel - remote_handler = lib.factory.get_provider(provider_name, - remote_site_name, - tree=tree, - presets=preset) - - file_path = file.get("path", "") - local_file_path, remote_file_path = self._resolve_paths( - file_path, collection, remote_site_name, remote_handler - ) - - target_folder = os.path.dirname(remote_file_path) - folder_id = remote_handler.create_folder(target_folder) - - if not folder_id: - err = "Folder {} wasn't created. Check permissions.".\ - format(target_folder) - raise NotADirectoryError(err) - - loop = asyncio.get_running_loop() - file_id = await loop.run_in_executor(None, - remote_handler.upload_file, - local_file_path, - remote_file_path, - self, - collection, - file, - representation, - remote_site_name, - True - ) - return file_id - - async def download(self, collection, file, representation, provider_name, - remote_site_name, tree=None, preset=None): - """ - Downloads file to local folder denoted in representation.Context. - - Args: - collection (str): source collection - file (dictionary) : info about processed file - representation (dictionary): repr that 'file' belongs to - provider_name (string): 'gdrive' etc - site_name (string): site on provider, single provider(gdrive) could - have multiple sites (different accounts, credentials) - tree (dictionary): injected memory structure for performance - preset (dictionary): site config ('credentials_url', 'root'...) - - Returns: - (string) - 'name' of local file - """ - with self.lock: - remote_handler = lib.factory.get_provider(provider_name, - remote_site_name, - tree=tree, - presets=preset) - - file_path = file.get("path", "") - local_file_path, remote_file_path = self._resolve_paths( - file_path, collection, remote_site_name, remote_handler - ) - - local_folder = os.path.dirname(local_file_path) - os.makedirs(local_folder, exist_ok=True) - - local_site = self.get_active_site(collection) - - loop = asyncio.get_running_loop() - file_id = await loop.run_in_executor(None, - remote_handler.download_file, - remote_file_path, - local_file_path, - self, - collection, - file, - representation, - local_site, - True - ) - return file_id - - def update_db(self, collection, new_file_id, file, representation, - site, error=None, progress=None): - """ - Update 'provider' portion of records in DB with success (file_id) - or error (exception) - - Args: - collection (string): name of project - force to db connection as - each file might come from different collection - new_file_id (string): - file (dictionary): info about processed file (pulled from DB) - representation (dictionary): parent repr of file (from DB) - site (string): label ('gdrive', 'S3') - error (string): exception message - progress (float): 0-1 of progress of upload/download - - Returns: - None - """ - representation_id = representation.get("_id") - file_id = file.get("_id") - query = { - "_id": representation_id - } - - update = {} - if new_file_id: - update["$set"] = self._get_success_dict(new_file_id) - # reset previous errors if any - update["$unset"] = self._get_error_dict("", "", "") - elif progress is not None: - update["$set"] = self._get_progress_dict(progress) - else: - tries = self._get_tries_count(file, site) - tries += 1 - - update["$set"] = self._get_error_dict(error, tries) - - arr_filter = [ - {'s.name': site}, - {'f._id': ObjectId(file_id)} - ] - - self.connection.database[collection].update_one( - query, - update, - upsert=True, - array_filters=arr_filter - ) - - if progress is not None: - return - - status = 'failed' - error_str = 'with error {}'.format(error) - if new_file_id: - status = 'succeeded with id {}'.format(new_file_id) - error_str = '' - - source_file = file.get("path", "") - log.debug("File for {} - {source_file} process {status} {error_str}". - format(representation_id, - status=status, - source_file=source_file, - error_str=error_str)) - - def _get_file_info(self, files, _id): - """ - Return record from list of records which name matches to 'provider' - Could be possibly refactored with '_get_provider_rec' together. - - Args: - files (list): of dictionaries with info about published files - _id (string): _id of specific file - - Returns: - (int, dictionary): index from list and record with metadata - about site (if/when created, errors..) - OR (-1, None) if not present - """ - for index, rec in enumerate(files): - if rec.get("_id") == _id: - return index, rec - - return -1, None - - def _get_site_rec(self, sites, site_name): - """ - Return record from list of records which name matches to - 'remote_site_name' - - Args: - sites (list): of dictionaries - site_name (string): 'local_XXX', 'gdrive' - - Returns: - (int, dictionary): index from list and record with metadata - about site (if/when created, errors..) - OR (-1, None) if not present - """ - for index, rec in enumerate(sites): - if rec.get("name") == site_name: - return index, rec - - return -1, None - - def reset_provider_for_file(self, collection, representation_id, - side=None, file_id=None, site_name=None, - remove=False, pause=None): - """ - Reset information about synchronization for particular 'file_id' - and provider. - Useful for testing or forcing file to be reuploaded. - - 'side' and 'site_name' are disjunctive. - - 'side' is used for resetting local or remote side for - current user for repre. - - 'site_name' is used to set synchronization for particular site. - Should be used when repre should be synced to new site. - - Args: - collection (string): name of project (eg. collection) in DB - representation_id(string): _id of representation - file_id (string): file _id in representation - side (string): local or remote side - site_name (string): for adding new site - remove (bool): if True remove site altogether - pause (bool or None): if True - pause, False - unpause - - Returns: - throws ValueError - """ - query = { - "_id": ObjectId(representation_id) - } - - representation = list(self.connection.database[collection].find(query)) - if not representation: - raise ValueError("Representation {} not found in {}". - format(representation_id, collection)) - if side and site_name: - raise ValueError("Misconfiguration, only one of side and " + - "site_name arguments should be passed.") - - local_site = self.get_active_site(collection) - remote_site = self.get_remote_site(collection) - - if side: - if side == 'local': - site_name = local_site - else: - site_name = remote_site - - elem = {"name": site_name} - - if file_id: # reset site for particular file - self._reset_site_for_file(collection, query, - elem, file_id, site_name) - elif side: # reset site for whole representation - self._reset_site(collection, query, elem, site_name) - elif remove: # remove site for whole representation - self._remove_site(collection, query, representation, site_name) - elif pause is not None: - self._pause_unpause_site(collection, query, - representation, site_name, pause) - else: # add new site to all files for representation - self._add_site(collection, query, representation, elem, site_name) - - def _update_site(self, collection, query, update, arr_filter): - """ - Auxiliary method to call update_one function on DB - - Used for refactoring ugly reset_provider_for_file - """ - self.connection.database[collection].update_one( - query, - update, - upsert=True, - array_filters=arr_filter - ) - - def _reset_site_for_file(self, collection, query, - elem, file_id, site_name): - """ - Resets 'site_name' for 'file_id' on representation in 'query' on - 'collection' - """ - update = { - "$set": {"files.$[f].sites.$[s]": elem} - } - arr_filter = [ - {'s.name': site_name}, - {'f._id': ObjectId(file_id)} - ] - - self._update_site(collection, query, update, arr_filter) - - def _reset_site(self, collection, query, elem, site_name): - """ - Resets 'site_name' for all files of representation in 'query' - """ - update = { - "$set": {"files.$[].sites.$[s]": elem} - } - - arr_filter = [ - {'s.name': site_name} - ] - - self._update_site(collection, query, update, arr_filter) - - def _remove_site(self, collection, query, representation, site_name): - """ - Removes 'site_name' for 'representation' in 'query' - - Throws ValueError if 'site_name' not found on 'representation' - """ - found = False - for file in representation.pop().get("files"): - for site in file.get("sites"): - if site["name"] == site_name: - found = True - break - if not found: - msg = "Site {} not found".format(site_name) - log.info(msg) - raise ValueError(msg) - - update = { - "$pull": {"files.$[].sites": {"name": site_name}} - } - arr_filter = [] - - self._update_site(collection, query, update, arr_filter) - - def _pause_unpause_site(self, collection, query, - representation, site_name, pause): - """ - Pauses/unpauses all files for 'representation' based on 'pause' - - Throws ValueError if 'site_name' not found on 'representation' - """ - found = False - site = None - for file in representation.pop().get("files"): - for site in file.get("sites"): - if site["name"] == site_name: - found = True - break - if not found: - msg = "Site {} not found".format(site_name) - log.info(msg) - raise ValueError(msg) - - if pause: - site['paused'] = pause - else: - if site.get('paused'): - site.pop('paused') - - update = { - "$set": {"files.$[].sites.$[s]": site} - } - - arr_filter = [ - {'s.name': site_name} - ] - - self._update_site(collection, query, update, arr_filter) - - def _add_site(self, collection, query, representation, elem, site_name): - """ - Adds 'site_name' to 'representation' on 'collection' - - Throws ValueError if already present - """ - for file in representation.pop().get("files"): - for site in file.get("sites"): - if site["name"] == site_name: - msg = "Site {} already present".format(site_name) - log.info(msg) - raise ValueError(msg) - - update = { - "$push": {"files.$[].sites": elem} - } - - arr_filter = [] - - self._update_site(collection, query, update, arr_filter) - - def _remove_local_file(self, collection, representation_id, site_name): - """ - Removes all local files for 'site_name' of 'representation_id' - - Args: - collection (string): project name (must match DB) - representation_id (string): MongoDB _id value - site_name (string): name of configured and active site - - Returns: - only logs, catches IndexError and OSError - """ - my_local_site = get_local_site_id() - if my_local_site != site_name: - self.log.warning("Cannot remove non local file for {}". - format(site_name)) - return - - provider_name = self.get_provider_for_site(collection, site_name) - handler = lib.factory.get_provider(provider_name, site_name) - - if handler and isinstance(handler, LocalDriveHandler): - query = { - "_id": ObjectId(representation_id) - } - - representation = list( - self.connection.database[collection].find(query)) - if not representation: - self.log.debug("No repre {} found".format( - representation_id)) - return - - representation = representation.pop() - local_file_path = '' - for file in representation.get("files"): - local_file_path, _ = self._resolve_paths(file.get("path", ""), - collection - ) - try: - self.log.debug("Removing {}".format(local_file_path)) - os.remove(local_file_path) - except IndexError: - msg = "No file set for {}".format(representation_id) - self.log.debug(msg) - raise ValueError(msg) - except OSError: - msg = "File {} cannot be removed".format(file["path"]) - self.log.warning(msg) - raise ValueError(msg) - - try: - folder = os.path.dirname(local_file_path) - os.rmdir(folder) - except OSError: - msg = "folder {} cannot be removed".format(folder) - self.log.warning(msg) - raise ValueError(msg) - - def get_loop_delay(self, project_name): - """ - Return count of seconds before next synchronization loop starts - after finish of previous loop. - Returns: - (int): in seconds - """ - ld = self.sync_project_settings[project_name]["config"]["loop_delay"] - return int(ld) - - def show_widget(self): - """Show dialog to enter credentials""" - self.widget.show() - - def _get_success_dict(self, new_file_id): - """ - Provide success metadata ("id", "created_dt") to be stored in Db. - Used in $set: "DICT" part of query. - Sites are array inside of array(file), so real indexes for both - file and site are needed for upgrade in DB. - Args: - new_file_id: id of created file - Returns: - (dictionary) - """ - val = {"files.$[f].sites.$[s].id": new_file_id, - "files.$[f].sites.$[s].created_dt": datetime.now()} - return val - - def _get_error_dict(self, error="", tries="", progress=""): - """ - Provide error metadata to be stored in Db. - Used for set (error and tries provided) or unset mode. - Args: - error: (string) - message - tries: how many times failed - Returns: - (dictionary) - """ - val = {"files.$[f].sites.$[s].last_failed_dt": datetime.now(), - "files.$[f].sites.$[s].error": error, - "files.$[f].sites.$[s].tries": tries, - "files.$[f].sites.$[s].progress": progress - } - return val - - def _get_tries_count_from_rec(self, rec): - """ - Get number of failed attempts to sync from site record - Args: - rec (dictionary): info about specific site record - Returns: - (int) - number of failed attempts - """ - if not rec: - return 0 - return rec.get("tries", 0) - - def _get_tries_count(self, file, provider): - """ - Get number of failed attempts to sync - Args: - file (dictionary): info about specific file - provider (string): name of site ('gdrive' or specific user site) - Returns: - (int) - number of failed attempts - """ - _, rec = self._get_site_rec(file.get("sites", []), provider) - return rec.get("tries", 0) - - def _get_progress_dict(self, progress): - """ - Provide progress metadata to be stored in Db. - Used during upload/download for GUI to show. - Args: - progress: (float) - 0-1 progress of upload/download - Returns: - (dictionary) - """ - val = {"files.$[f].sites.$[s].progress": progress} - return val - - def _resolve_paths(self, file_path, collection, - remote_site_name=None, remote_handler=None): - """ - Returns tuple of local and remote file paths with {root} - placeholders replaced with proper values from Settings or Anatomy - - Args: - file_path(string): path with {root} - collection(string): project name - remote_site_name(string): remote site - remote_handler(AbstractProvider): implementation - Returns: - (string, string) - proper absolute paths - """ - remote_file_path = '' - if remote_handler: - root_configs = self._get_roots_config(self.sync_project_settings, - collection, - remote_site_name) - - remote_file_path = remote_handler.resolve_path(file_path, - root_configs) - - local_handler = lib.factory.get_provider( - 'local_drive', self.get_active_site(collection)) - local_file_path = local_handler.resolve_path( - file_path, None, self.get_anatomy(collection)) - - return local_file_path, remote_file_path - - def _get_retries_arr(self, project_name): - """ - Returns array with allowed values in 'tries' field. If repre - contains these values, it means it was tried to be synchronized - but failed. We try up to 'self.presets["retry_cnt"]' times before - giving up and skipping representation. - Returns: - (list) - """ - retry_cnt = self.sync_project_settings[project_name].\ - get("config")["retry_cnt"] - arr = [i for i in range(int(retry_cnt))] - arr.append(None) - - return arr - - def _get_roots_config(self, presets, project_name, site_name): - """ - Returns configured root(s) for 'project_name' and 'site_name' from - settings ('presets') - """ - return presets[project_name]['sites'][site_name]['root'] - + initiated_handlers = {} + configured_sites = {} + all_sites = module._get_default_site_configs() + all_sites.update(project_setting.get("sites")) + for site_name, config in all_sites.items(): + handler = initiated_handlers. \ + get((config["provider"], site_name)) + if not handler: + handler = lib.factory.get_provider(config["provider"], + project_name, + site_name, + presets=config) + initiated_handlers[(config["provider"], site_name)] = \ + handler + + if handler.is_active(): + configured_sites[site_name] = True + + return configured_sites class SyncServerThread(threading.Thread): """ @@ -1437,7 +271,7 @@ class SyncServerThread(threading.Thread): import time start_time = None self.module.set_sync_project_settings() # clean cache - for collection, preset in self.module.get_sync_project_settings().\ + for collection, preset in self.module.sync_project_settings.\ items(): start_time = time.time() local_site, remote_site = self._working_sites(collection) @@ -1462,6 +296,7 @@ class SyncServerThread(threading.Thread): site_preset = preset.get('sites')[remote_site] remote_provider = site_preset['provider'] handler = lib.factory.get_provider(remote_provider, + collection, remote_site, presets=site_preset) limit = lib.factory.get_provider_batch_limit( @@ -1491,13 +326,14 @@ class SyncServerThread(threading.Thread): tree = handler.get_tree() limit -= 1 task = asyncio.create_task( - self.module.upload(collection, - file, - sync, - remote_provider, - remote_site, - tree, - site_preset)) + upload(self.module, + collection, + file, + sync, + remote_provider, + remote_site, + tree, + site_preset)) task_files_to_process.append(task) # store info for exception handlingy files_processed_info.append((file, @@ -1510,13 +346,14 @@ class SyncServerThread(threading.Thread): tree = handler.get_tree() limit -= 1 task = asyncio.create_task( - self.module.download(collection, - file, - sync, - remote_provider, - remote_site, - tree, - site_preset)) + download(self.module, + collection, + file, + sync, + remote_provider, + remote_site, + tree, + site_preset)) task_files_to_process.append(task) files_processed_info.append((file, @@ -1592,8 +429,8 @@ class SyncServerThread(threading.Thread): remote_site)) return None, None - if not all([self.module.site_is_working(collection, local_site), - self.module.site_is_working(collection, remote_site)]): + if not all([site_is_working(self.module, collection, local_site), + site_is_working(self.module, collection, remote_site)]): log.debug("Some of the sites {} - {} is not ".format(local_site, remote_site) + "working properly") diff --git a/openpype/modules/sync_server/sync_server_module.py b/openpype/modules/sync_server/sync_server_module.py new file mode 100644 index 0000000000..59c3787789 --- /dev/null +++ b/openpype/modules/sync_server/sync_server_module.py @@ -0,0 +1,1193 @@ +import os +from bson.objectid import ObjectId +from datetime import datetime +import threading + +from avalon.api import AvalonMongoDB + +from .. import PypeModule, ITrayModule +from openpype.api import ( + Anatomy, + get_project_settings, + get_local_site_id) +from openpype.lib import PypeLogger + +from .providers.local_drive import LocalDriveHandler + +from .utils import time_function, SyncStatus + + +log = PypeLogger().get_logger("SyncServer") + + +class SyncServerModule(PypeModule, ITrayModule): + """ + Synchronization server that is syncing published files from local to + any of implemented providers (like GDrive, S3 etc.) + Runs in the background and checks all representations, looks for files + that are marked to be in different location than 'studio' (temporary), + checks if 'created_dt' field is present denoting successful sync + with provider destination. + Sites structure is created during publish OR by calling 'add_site' + method. + + By default it will always contain 1 record with + "name" == self.presets["active_site"] and + filled "created_dt" AND 1 or multiple records for all defined + remote sites, where "created_dt" is not present. + This highlights that file should be uploaded to + remote destination + + ''' - example of synced file test_Cylinder_lookMain_v010.ma to GDrive + "files" : [ + { + "path" : "{root}/Test/Assets/Cylinder/publish/look/lookMain/v010/ + test_Cylinder_lookMain_v010.ma", + "_id" : ObjectId("5eeb25e411e06a16209ab78f"), + "hash" : "test_Cylinder_lookMain_v010,ma|1592468963,24|4822", + "size" : NumberLong(4822), + "sites" : [ + { + "name": "john_local_XD4345", + "created_dt" : ISODate("2020-05-22T08:05:44.000Z") + }, + { + "id" : ObjectId("5eeb25e411e06a16209ab78f"), + "name": "gdrive", + "created_dt" : ISODate("2020-05-55T08:54:35.833Z") + ] + } + }, + ''' + Each Tray app has assigned its own self.presets["local_id"] + used in sites as a name. + Tray is searching only for records where name matches its + self.presets["active_site"] + self.presets["remote_site"]. + "active_site" could be storage in studio ('studio'), or specific + "local_id" when user is working disconnected from home. + If the local record has its "created_dt" filled, it is a source and + process will try to upload the file to all defined remote sites. + + Remote files "id" is real id that could be used in appropriate API. + Local files have "id" too, for conformity, contains just file name. + It is expected that multiple providers will be implemented in separate + classes and registered in 'providers.py'. + + """ + # limit querying DB to look for X number of representations that should + # be sync, we try to run more loops with less records + # actual number of files synced could be lower as providers can have + # different limits imposed by its API + # set 0 to no limit + REPRESENTATION_LIMIT = 100 + DEFAULT_SITE = 'studio' + LOCAL_SITE = 'local' + LOG_PROGRESS_SEC = 5 # how often log progress to DB + + name = "sync_server" + label = "Sync Queue" + + def initialize(self, module_settings): + """ + Called during Module Manager creation. + + Collects needed data, checks asyncio presence. + Sets 'enabled' according to global settings for the module. + Shouldnt be doing any initialization, thats a job for 'tray_init' + """ + self.enabled = module_settings[self.name]["enabled"] + + # some parts of code need to run sequentially, not in async + self.lock = None + # settings for all enabled projects for sync + self._sync_project_settings = None + self.sync_server_thread = None # asyncio requires new thread + + self.action_show_widget = None + self._paused = False + self._paused_projects = set() + self._paused_representations = set() + self._anatomies = {} + + self._connection = None + + """ Start of Public API """ + def add_site(self, collection, representation_id, site_name=None, + force=False): + """ + Adds new site to representation to be synced. + + 'collection' must have synchronization enabled (globally or + project only) + + Used as a API endpoint from outside applications (Loader etc) + + Args: + collection (string): project name (must match DB) + representation_id (string): MongoDB _id value + site_name (string): name of configured and active site + force (bool): reset site if exists + + Returns: + throws ValueError if any issue + """ + if not self.get_sync_project_setting(collection): + raise ValueError("Project not configured") + + if not site_name: + site_name = self.DEFAULT_SITE + + self.reset_provider_for_file(collection, + representation_id, + site_name=site_name, force=force) + + # public facing API + def remove_site(self, collection, representation_id, site_name, + remove_local_files=False): + """ + Removes 'site_name' for particular 'representation_id' on + 'collection' + + Args: + collection (string): project name (must match DB) + representation_id (string): MongoDB _id value + site_name (string): name of configured and active site + remove_local_files (bool): remove only files for 'local_id' + site + + Returns: + throws ValueError if any issue + """ + if not self.get_sync_project_setting(collection): + raise ValueError("Project not configured") + + self.reset_provider_for_file(collection, + representation_id, + site_name=site_name, + remove=True) + if remove_local_files: + self._remove_local_file(collection, representation_id, site_name) + + def clear_project(self, collection, site_name): + """ + Clear 'collection' of 'site_name' and its local files + + Works only on real local sites, not on 'studio' + """ + query = { + "type": "representation", + "files.sites.name": site_name + } + + representations = list( + self.connection.database[collection].find(query)) + if not representations: + self.log.debug("No repre found") + return + + for repre in representations: + self.remove_site(collection, repre.get("_id"), site_name, True) + + def pause_representation(self, collection, representation_id, site_name): + """ + Sets 'representation_id' as paused, eg. no syncing should be + happening on it. + + Args: + collection (string): project name + representation_id (string): MongoDB objectId value + site_name (string): 'gdrive', 'studio' etc. + """ + log.info("Pausing SyncServer for {}".format(representation_id)) + self._paused_representations.add(representation_id) + self.reset_provider_for_file(collection, representation_id, + site_name=site_name, pause=True) + + def unpause_representation(self, collection, representation_id, site_name): + """ + Sets 'representation_id' as unpaused. + + Does not fail or warn if repre wasn't paused. + + Args: + collection (string): project name + representation_id (string): MongoDB objectId value + site_name (string): 'gdrive', 'studio' etc. + """ + log.info("Unpausing SyncServer for {}".format(representation_id)) + try: + self._paused_representations.remove(representation_id) + except KeyError: + pass + # self.paused_representations is not persistent + self.reset_provider_for_file(collection, representation_id, + site_name=site_name, pause=False) + + def is_representation_paused(self, representation_id, + check_parents=False, project_name=None): + """ + Returns if 'representation_id' is paused or not. + + Args: + representation_id (string): MongoDB objectId value + check_parents (bool): check if parent project or server itself + are not paused + project_name (string): project to check if paused + + if 'check_parents', 'project_name' should be set too + Returns: + (bool) + """ + condition = representation_id in self._paused_representations + if check_parents and project_name: + condition = condition or \ + self.is_project_paused(project_name) or \ + self.is_paused() + return condition + + def pause_project(self, project_name): + """ + Sets 'project_name' as paused, eg. no syncing should be + happening on all representation inside. + + Args: + project_name (string): collection name + """ + log.info("Pausing SyncServer for {}".format(project_name)) + self._paused_projects.add(project_name) + + def unpause_project(self, project_name): + """ + Sets 'project_name' as unpaused + + Does not fail or warn if project wasn't paused. + + Args: + project_name (string): collection name + """ + log.info("Unpausing SyncServer for {}".format(project_name)) + try: + self._paused_projects.remove(project_name) + except KeyError: + pass + + def is_project_paused(self, project_name, check_parents=False): + """ + Returns if 'project_name' is paused or not. + + Args: + project_name (string): collection name + check_parents (bool): check if server itself + is not paused + Returns: + (bool) + """ + condition = project_name in self._paused_projects + if check_parents: + condition = condition or self.is_paused() + return condition + + def pause_server(self): + """ + Pause sync server + + It won't check anything, not uploading/downloading... + """ + log.info("Pausing SyncServer") + self._paused = True + + def unpause_server(self): + """ + Unpause server + """ + log.info("Unpausing SyncServer") + self._paused = False + + def is_paused(self): + """ Is server paused """ + return self._paused + + def get_active_sites(self, project_name): + """ + Returns list of active sites for 'project_name'. + + By default it returns ['studio'], this site is default + and always present even if SyncServer is not enabled. (for publish) + + Used mainly for Local settings for user override. + + Args: + project_name (string): + + Returns: + (list) of strings + """ + return self.get_active_sites_from_settings( + get_project_settings(project_name)) + + def get_active_sites_from_settings(self, settings): + """ + List available active sites from incoming 'settings'. Used for + returning 'default' values for Local Settings + + Args: + settings (dict): full settings (global + project) + Returns: + (list) of strings + """ + sync_settings = self._parse_sync_settings_from_settings(settings) + + return self._get_enabled_sites_from_settings(sync_settings) + + def get_configurable_items_for_site(self, project_name, site_name): + """ + Returns list of items that should be configurable by User + + Returns: + (list of dict) + [{key:"root", label:"root", value:"valueFromSettings"}] + """ + # if project_name is None: ..for get_default_project_settings + # return handler.get_configurable_items() + pass + + def get_active_site(self, project_name): + """ + Returns active (mine) site for 'project_name' from settings + + Returns: + (string) + """ + active_site = self.get_sync_project_setting( + project_name)['config']['active_site'] + if active_site == self.LOCAL_SITE: + return get_local_site_id() + return active_site + + # remote sites + def get_remote_sites(self, project_name): + """ + Returns all remote sites configured on 'project_name'. + + If 'project_name' is not enabled for syncing returns []. + + Used by Local setting to allow user choose remote site. + + Args: + project_name (string): + + Returns: + (list) of strings + """ + return self.get_remote_sites_from_settings( + get_project_settings(project_name)) + + def get_remote_sites_from_settings(self, settings): + """ + Get remote sites for returning 'default' values for Local Settings + """ + sync_settings = self._parse_sync_settings_from_settings(settings) + + return self._get_remote_sites_from_settings(sync_settings) + + def get_remote_site(self, project_name): + """ + Returns remote (theirs) site for 'project_name' from settings + """ + remote_site = self.get_sync_project_setting( + project_name)['config']['remote_site'] + if remote_site == self.LOCAL_SITE: + return get_local_site_id() + + return remote_site + + """ End of Public API """ + + def get_local_file_path(self, collection, site_name, file_path): + """ + Externalized for app + """ + handler = LocalDriveHandler(collection, site_name) + local_file_path = handler.resolve_path(file_path) + + return local_file_path + + def _get_remote_sites_from_settings(self, sync_settings): + if not self.enabled or not sync_settings['enabled']: + return [] + + remote_sites = [self.DEFAULT_SITE, self.LOCAL_SITE] + if sync_settings: + remote_sites.extend(sync_settings.get("sites").keys()) + + return list(set(remote_sites)) + + def _get_enabled_sites_from_settings(self, sync_settings): + sites = [self.DEFAULT_SITE] + if self.enabled and sync_settings['enabled']: + sites.append(self.LOCAL_SITE) + + return sites + + def connect_with_modules(self, *_a, **kw): + return + + def tray_init(self): + """ + Actual initialization of Sync Server. + + Called when tray is initialized, it checks if module should be + enabled. If not, no initialization necessary. + """ + # import only in tray, because of Python2 hosts + from .sync_server import SyncServerThread + + if not self.enabled: + return + + self.lock = threading.Lock() + + try: + self.sync_server_thread = SyncServerThread(self) + from .tray.app import SyncServerWindow + self.widget = SyncServerWindow(self) + except ValueError: + log.info("No system setting for sync. Not syncing.", exc_info=True) + self.enabled = False + except KeyError: + log.info(( + "There are not set presets for SyncServer OR " + "Credentials provided are invalid, " + "no syncing possible"). + format(str(self.sync_project_settings)), exc_info=True) + self.enabled = False + + def tray_start(self): + """ + Triggered when Tray is started. + + Checks if configuration presets are available and if there is + any provider ('gdrive', 'S3') that is activated + (eg. has valid credentials). + + Returns: + None + """ + if self.sync_project_settings and self.enabled: + self.sync_server_thread.start() + else: + log.info("No presets or active providers. " + + "Synchronization not possible.") + + def tray_exit(self): + """ + Stops sync thread if running. + + Called from Module Manager + """ + if not self.sync_server_thread: + return + + if not self.is_running: + return + try: + log.info("Stopping sync server server") + self.sync_server_thread.is_running = False + self.sync_server_thread.stop() + except Exception: + log.warning( + "Error has happened during Killing sync server", + exc_info=True + ) + + def tray_menu(self, parent_menu): + if not self.enabled: + return + + from Qt import QtWidgets + """Add menu or action to Tray(or parent)'s menu""" + action = QtWidgets.QAction(self.label, parent_menu) + action.triggered.connect(self.show_widget) + parent_menu.addAction(action) + parent_menu.addSeparator() + + self.action_show_widget = action + + @property + def is_running(self): + return self.sync_server_thread.is_running + + def get_anatomy(self, project_name): + """ + Get already created or newly created anatomy for project + + Args: + project_name (string): + + Return: + (Anatomy) + """ + return self._anatomies.get('project_name') or Anatomy(project_name) + + @property + def connection(self): + if self._connection is None: + self._connection = AvalonMongoDB() + + return self._connection + + @property + def sync_project_settings(self): + if self._sync_project_settings is None: + self.set_sync_project_settings() + + return self._sync_project_settings + + def set_sync_project_settings(self): + """ + Set sync_project_settings for all projects (caching) + + For performance + """ + sync_project_settings = {} + + for collection in self.connection.database.collection_names(False): + sync_settings = self._parse_sync_settings_from_settings( + get_project_settings(collection)) + if sync_settings: + default_sites = self._get_default_site_configs() + sync_settings['sites'].update(default_sites) + sync_project_settings[collection] = sync_settings + + if not sync_project_settings: + log.info("No enabled and configured projects for sync.") + + self._sync_project_settings = sync_project_settings + + def get_sync_project_setting(self, project_name): + """ Handles pulling sync_server's settings for enabled 'project_name' + + Args: + project_name (str): used in project settings + Returns: + (dict): settings dictionary for the enabled project, + empty if no settings or sync is disabled + """ + # presets set already, do not call again and again + # self.log.debug("project preset {}".format(self.presets)) + if self.sync_project_settings and \ + self.sync_project_settings.get(project_name): + return self.sync_project_settings.get(project_name) + + settings = get_project_settings(project_name) + return self._parse_sync_settings_from_settings(settings) + + def _parse_sync_settings_from_settings(self, settings): + """ settings from api.get_project_settings, TOOD rename """ + sync_settings = settings.get("global").get("sync_server") + if not sync_settings: + log.info("No project setting not syncing.") + return {} + if sync_settings.get("enabled"): + return sync_settings + + return {} + + def _get_default_site_configs(self): + """ + Returns skeleton settings for 'studio' and user's local site + """ + default_config = {'provider': 'local_drive'} + all_sites = {self.DEFAULT_SITE: default_config, + get_local_site_id(): default_config} + return all_sites + + def get_provider_for_site(self, project_name, site): + """ + Return provider name for site. + """ + site_preset = self.get_sync_project_setting(project_name)["sites"].\ + get(site) + if site_preset: + return site_preset["provider"] + + return "NA" + + @time_function + def get_sync_representations(self, collection, active_site, remote_site): + """ + Get representations that should be synced, these could be + recognised by presence of document in 'files.sites', where key is + a provider (GDrive, S3) and value is empty document or document + without 'created_dt' field. (Don't put null to 'created_dt'!). + + Querying of 'to-be-synched' files is offloaded to Mongod for + better performance. Goal is to get as few representations as + possible. + Args: + collection (string): name of collection (in most cases matches + project name + active_site (string): identifier of current active site (could be + 'local_0' when working from home, 'studio' when working in the + studio (default) + remote_site (string): identifier of remote site I want to sync to + + Returns: + (list) of dictionaries + """ + log.debug("Check representations for : {}".format(collection)) + self.connection.Session["AVALON_PROJECT"] = collection + # retry_cnt - number of attempts to sync specific file before giving up + retries_arr = self._get_retries_arr(collection) + query = { + "type": "representation", + "$or": [ + {"$and": [ + { + "files.sites": { + "$elemMatch": { + "name": active_site, + "created_dt": {"$exists": True} + } + }}, { + "files.sites": { + "$elemMatch": { + "name": {"$in": [remote_site]}, + "created_dt": {"$exists": False}, + "tries": {"$in": retries_arr} + } + } + }]}, + {"$and": [ + { + "files.sites": { + "$elemMatch": { + "name": active_site, + "created_dt": {"$exists": False}, + "tries": {"$in": retries_arr} + } + }}, { + "files.sites": { + "$elemMatch": { + "name": {"$in": [remote_site]}, + "created_dt": {"$exists": True} + } + } + } + ]} + ] + } + log.debug("active_site:{} - remote_site:{}".format(active_site, + remote_site)) + log.debug("query: {}".format(query)) + representations = self.connection.find(query) + + return representations + + def check_status(self, file, local_site, remote_site, config_preset): + """ + Check synchronization status for single 'file' of single + 'representation' by single 'provider'. + (Eg. check if 'scene.ma' of lookdev.v10 should be synced to GDrive + + Always is comparing local record, eg. site with + 'name' == self.presets[PROJECT_NAME]['config']["active_site"] + + Args: + file (dictionary): of file from representation in Mongo + local_site (string): - local side of compare (usually 'studio') + remote_site (string): - gdrive etc. + config_preset (dict): config about active site, retries + Returns: + (string) - one of SyncStatus + """ + sites = file.get("sites") or [] + # if isinstance(sites, list): # temporary, old format of 'sites' + # return SyncStatus.DO_NOTHING + _, remote_rec = self._get_site_rec(sites, remote_site) or {} + if remote_rec: # sync remote target + created_dt = remote_rec.get("created_dt") + if not created_dt: + tries = self._get_tries_count_from_rec(remote_rec) + # file will be skipped if unsuccessfully tried over threshold + # error metadata needs to be purged manually in DB to reset + if tries < int(config_preset["retry_cnt"]): + return SyncStatus.DO_UPLOAD + else: + _, local_rec = self._get_site_rec(sites, local_site) or {} + if not local_rec or not local_rec.get("created_dt"): + tries = self._get_tries_count_from_rec(local_rec) + # file will be skipped if unsuccessfully tried over + # threshold times, error metadata needs to be purged + # manually in DB to reset + if tries < int(config_preset["retry_cnt"]): + return SyncStatus.DO_DOWNLOAD + + return SyncStatus.DO_NOTHING + + def update_db(self, collection, new_file_id, file, representation, + site, error=None, progress=None): + """ + Update 'provider' portion of records in DB with success (file_id) + or error (exception) + + Args: + collection (string): name of project - force to db connection as + each file might come from different collection + new_file_id (string): + file (dictionary): info about processed file (pulled from DB) + representation (dictionary): parent repr of file (from DB) + site (string): label ('gdrive', 'S3') + error (string): exception message + progress (float): 0-1 of progress of upload/download + + Returns: + None + """ + representation_id = representation.get("_id") + file_id = file.get("_id") + query = { + "_id": representation_id + } + + update = {} + if new_file_id: + update["$set"] = self._get_success_dict(new_file_id) + # reset previous errors if any + update["$unset"] = self._get_error_dict("", "", "") + elif progress is not None: + update["$set"] = self._get_progress_dict(progress) + else: + tries = self._get_tries_count(file, site) + tries += 1 + + update["$set"] = self._get_error_dict(error, tries) + + arr_filter = [ + {'s.name': site}, + {'f._id': ObjectId(file_id)} + ] + + self.connection.database[collection].update_one( + query, + update, + upsert=True, + array_filters=arr_filter + ) + + if progress is not None: + return + + status = 'failed' + error_str = 'with error {}'.format(error) + if new_file_id: + status = 'succeeded with id {}'.format(new_file_id) + error_str = '' + + source_file = file.get("path", "") + log.debug("File for {} - {source_file} process {status} {error_str}". + format(representation_id, + status=status, + source_file=source_file, + error_str=error_str)) + + def _get_file_info(self, files, _id): + """ + Return record from list of records which name matches to 'provider' + Could be possibly refactored with '_get_provider_rec' together. + + Args: + files (list): of dictionaries with info about published files + _id (string): _id of specific file + + Returns: + (int, dictionary): index from list and record with metadata + about site (if/when created, errors..) + OR (-1, None) if not present + """ + for index, rec in enumerate(files): + if rec.get("_id") == _id: + return index, rec + + return -1, None + + def _get_site_rec(self, sites, site_name): + """ + Return record from list of records which name matches to + 'remote_site_name' + + Args: + sites (list): of dictionaries + site_name (string): 'local_XXX', 'gdrive' + + Returns: + (int, dictionary): index from list and record with metadata + about site (if/when created, errors..) + OR (-1, None) if not present + """ + for index, rec in enumerate(sites): + if rec.get("name") == site_name: + return index, rec + + return -1, None + + def reset_provider_for_file(self, collection, representation_id, + side=None, file_id=None, site_name=None, + remove=False, pause=None, force=False): + """ + Reset information about synchronization for particular 'file_id' + and provider. + Useful for testing or forcing file to be reuploaded. + + 'side' and 'site_name' are disjunctive. + + 'side' is used for resetting local or remote side for + current user for repre. + + 'site_name' is used to set synchronization for particular site. + Should be used when repre should be synced to new site. + + Args: + collection (string): name of project (eg. collection) in DB + representation_id(string): _id of representation + file_id (string): file _id in representation + side (string): local or remote side + site_name (string): for adding new site + remove (bool): if True remove site altogether + pause (bool or None): if True - pause, False - unpause + force (bool): hard reset - currently only for add_site + + Returns: + throws ValueError + """ + query = { + "_id": ObjectId(representation_id) + } + + representation = list(self.connection.database[collection].find(query)) + if not representation: + raise ValueError("Representation {} not found in {}". + format(representation_id, collection)) + if side and site_name: + raise ValueError("Misconfiguration, only one of side and " + + "site_name arguments should be passed.") + + local_site = self.get_active_site(collection) + remote_site = self.get_remote_site(collection) + + if side: + if side == 'local': + site_name = local_site + else: + site_name = remote_site + + elem = {"name": site_name} + + if file_id: # reset site for particular file + self._reset_site_for_file(collection, query, + elem, file_id, site_name) + elif side: # reset site for whole representation + self._reset_site(collection, query, elem, site_name) + elif remove: # remove site for whole representation + self._remove_site(collection, query, representation, site_name) + elif pause is not None: + self._pause_unpause_site(collection, query, + representation, site_name, pause) + else: # add new site to all files for representation + self._add_site(collection, query, representation, elem, site_name, + force) + + def _update_site(self, collection, query, update, arr_filter): + """ + Auxiliary method to call update_one function on DB + + Used for refactoring ugly reset_provider_for_file + """ + self.connection.database[collection].update_one( + query, + update, + upsert=True, + array_filters=arr_filter + ) + + def _reset_site_for_file(self, collection, query, + elem, file_id, site_name): + """ + Resets 'site_name' for 'file_id' on representation in 'query' on + 'collection' + """ + update = { + "$set": {"files.$[f].sites.$[s]": elem} + } + arr_filter = [ + {'s.name': site_name}, + {'f._id': ObjectId(file_id)} + ] + + self._update_site(collection, query, update, arr_filter) + + def _reset_site(self, collection, query, elem, site_name): + """ + Resets 'site_name' for all files of representation in 'query' + """ + update = { + "$set": {"files.$[].sites.$[s]": elem} + } + + arr_filter = [ + {'s.name': site_name} + ] + + self._update_site(collection, query, update, arr_filter) + + def _remove_site(self, collection, query, representation, site_name): + """ + Removes 'site_name' for 'representation' in 'query' + + Throws ValueError if 'site_name' not found on 'representation' + """ + found = False + for repre_file in representation.pop().get("files"): + for site in repre_file.get("sites"): + if site["name"] == site_name: + found = True + break + if not found: + msg = "Site {} not found".format(site_name) + log.info(msg) + raise ValueError(msg) + + update = { + "$pull": {"files.$[].sites": {"name": site_name}} + } + arr_filter = [] + + self._update_site(collection, query, update, arr_filter) + + def _pause_unpause_site(self, collection, query, + representation, site_name, pause): + """ + Pauses/unpauses all files for 'representation' based on 'pause' + + Throws ValueError if 'site_name' not found on 'representation' + """ + found = False + site = None + for repre_file in representation.pop().get("files"): + for site in repre_file.get("sites"): + if site["name"] == site_name: + found = True + break + if not found: + msg = "Site {} not found".format(site_name) + log.info(msg) + raise ValueError(msg) + + if pause: + site['paused'] = pause + else: + if site.get('paused'): + site.pop('paused') + + update = { + "$set": {"files.$[].sites.$[s]": site} + } + + arr_filter = [ + {'s.name': site_name} + ] + + self._update_site(collection, query, update, arr_filter) + + def _add_site(self, collection, query, representation, elem, site_name, + force=False): + """ + Adds 'site_name' to 'representation' on 'collection' + + Use 'force' to remove existing or raises ValueError + """ + for repre_file in representation.pop().get("files"): + for site in repre_file.get("sites"): + if site["name"] == site_name: + if force: + self._reset_site_for_file(collection, query, + elem, repre_file["_id"], + site_name) + return + else: + msg = "Site {} already present".format(site_name) + log.info(msg) + raise ValueError(msg) + + update = { + "$push": {"files.$[].sites": elem} + } + + arr_filter = [] + + self._update_site(collection, query, update, arr_filter) + + def _remove_local_file(self, collection, representation_id, site_name): + """ + Removes all local files for 'site_name' of 'representation_id' + + Args: + collection (string): project name (must match DB) + representation_id (string): MongoDB _id value + site_name (string): name of configured and active site + + Returns: + only logs, catches IndexError and OSError + """ + my_local_site = get_local_site_id() + if my_local_site != site_name: + self.log.warning("Cannot remove non local file for {}". + format(site_name)) + return + + provider_name = self.get_provider_for_site(collection, site_name) + + if provider_name == 'local_drive': + query = { + "_id": ObjectId(representation_id) + } + + representation = list( + self.connection.database[collection].find(query)) + if not representation: + self.log.debug("No repre {} found".format( + representation_id)) + return + + representation = representation.pop() + local_file_path = '' + for file in representation.get("files"): + local_file_path = self.get_local_file_path(collection, + site_name, + file.get("path", "") + ) + try: + self.log.debug("Removing {}".format(local_file_path)) + os.remove(local_file_path) + except IndexError: + msg = "No file set for {}".format(representation_id) + self.log.debug(msg) + raise ValueError(msg) + except OSError: + msg = "File {} cannot be removed".format(file["path"]) + self.log.warning(msg) + raise ValueError(msg) + + folder = None + try: + folder = os.path.dirname(local_file_path) + os.rmdir(folder) + except OSError: + msg = "folder {} cannot be removed".format(folder) + self.log.warning(msg) + raise ValueError(msg) + + def get_loop_delay(self, project_name): + """ + Return count of seconds before next synchronization loop starts + after finish of previous loop. + Returns: + (int): in seconds + """ + ld = self.sync_project_settings[project_name]["config"]["loop_delay"] + return int(ld) + + def show_widget(self): + """Show dialog to enter credentials""" + self.widget.show() + + def _get_success_dict(self, new_file_id): + """ + Provide success metadata ("id", "created_dt") to be stored in Db. + Used in $set: "DICT" part of query. + Sites are array inside of array(file), so real indexes for both + file and site are needed for upgrade in DB. + Args: + new_file_id: id of created file + Returns: + (dictionary) + """ + val = {"files.$[f].sites.$[s].id": new_file_id, + "files.$[f].sites.$[s].created_dt": datetime.now()} + return val + + def _get_error_dict(self, error="", tries="", progress=""): + """ + Provide error metadata to be stored in Db. + Used for set (error and tries provided) or unset mode. + Args: + error: (string) - message + tries: how many times failed + Returns: + (dictionary) + """ + val = {"files.$[f].sites.$[s].last_failed_dt": datetime.now(), + "files.$[f].sites.$[s].error": error, + "files.$[f].sites.$[s].tries": tries, + "files.$[f].sites.$[s].progress": progress + } + return val + + def _get_tries_count_from_rec(self, rec): + """ + Get number of failed attempts to sync from site record + Args: + rec (dictionary): info about specific site record + Returns: + (int) - number of failed attempts + """ + if not rec: + return 0 + return rec.get("tries", 0) + + def _get_tries_count(self, file, provider): + """ + Get number of failed attempts to sync + Args: + file (dictionary): info about specific file + provider (string): name of site ('gdrive' or specific user site) + Returns: + (int) - number of failed attempts + """ + _, rec = self._get_site_rec(file.get("sites", []), provider) + return rec.get("tries", 0) + + def _get_progress_dict(self, progress): + """ + Provide progress metadata to be stored in Db. + Used during upload/download for GUI to show. + Args: + progress: (float) - 0-1 progress of upload/download + Returns: + (dictionary) + """ + val = {"files.$[f].sites.$[s].progress": progress} + return val + + def _get_retries_arr(self, project_name): + """ + Returns array with allowed values in 'tries' field. If repre + contains these values, it means it was tried to be synchronized + but failed. We try up to 'self.presets["retry_cnt"]' times before + giving up and skipping representation. + Returns: + (list) + """ + retry_cnt = self.sync_project_settings[project_name].\ + get("config")["retry_cnt"] + arr = [i for i in range(int(retry_cnt))] + arr.append(None) + + return arr + + def _get_roots_config(self, presets, project_name, site_name): + """ + Returns configured root(s) for 'project_name' and 'site_name' from + settings ('presets') + """ + return presets[project_name]['sites'][site_name]['root'] diff --git a/openpype/modules/sync_server/tray/app.py b/openpype/modules/sync_server/tray/app.py index 476e9d16e8..25fbf0e49a 100644 --- a/openpype/modules/sync_server/tray/app.py +++ b/openpype/modules/sync_server/tray/app.py @@ -1,35 +1,17 @@ from Qt import QtWidgets, QtCore, QtGui -from Qt.QtCore import Qt -import attr -import os -import sys -import subprocess - -from openpype.tools.settings import ( - ProjectListWidget, - style -) - -from avalon.tools.delegates import PrettyTimeDelegate, pretty_timestamp -from bson.objectid import ObjectId +from openpype.tools.settings import style from openpype.lib import PypeLogger -from openpype.api import get_local_site_id +from openpype import resources + +from openpype.modules.sync_server.tray.widgets import ( + SyncProjectListWidget, + SyncRepresentationWidget +) log = PypeLogger().get_logger("SyncServer") -STATUS = { - 0: 'In Progress', - 1: 'Failed', - 2: 'Queued', - 3: 'Paused', - 4: 'Synced OK', - -1: 'Not available' -} - -DUMMY_PROJECT = "No project configured" - class SyncServerWindow(QtWidgets.QDialog): """ @@ -44,8 +26,8 @@ class SyncServerWindow(QtWidgets.QDialog): self.setFocusPolicy(QtCore.Qt.StrongFocus) self.setStyleSheet(style.load_stylesheet()) - self.setWindowIcon(QtGui.QIcon(style.app_icon_path())) - self.resize(1400, 800) + self.setWindowIcon(QtGui.QIcon(resources.pype_icon_filepath())) + self.resize(1450, 700) self.timer = QtCore.QTimer() self.timer.timeout.connect(self._hide_message) @@ -134,1912 +116,3 @@ class SyncServerWindow(QtWidgets.QDialog): """ self.message.setText("") self.message.hide() - - -class SyncProjectListWidget(ProjectListWidget): - """ - Lists all projects that are synchronized to choose from - """ - - def __init__(self, sync_server, parent): - super(SyncProjectListWidget, self).__init__(parent) - self.sync_server = sync_server - self.project_list.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) - self.project_list.customContextMenuRequested.connect( - self._on_context_menu) - self.project_name = None - self.local_site = None - self.icons = {} - - def validate_context_change(self): - return True - - def refresh(self): - model = self.project_list.model() - model.clear() - - project_name = None - for project_name in self.sync_server.get_sync_project_settings().\ - keys(): - if self.sync_server.is_paused() or \ - self.sync_server.is_project_paused(project_name): - icon = self._get_icon("paused") - else: - icon = self._get_icon("synced") - - model.appendRow(QtGui.QStandardItem(icon, project_name)) - - if len(self.sync_server.get_sync_project_settings().keys()) == 0: - model.appendRow(QtGui.QStandardItem(DUMMY_PROJECT)) - - self.current_project = self.project_list.currentIndex().data( - QtCore.Qt.DisplayRole - ) - if not self.current_project: - self.current_project = self.project_list.model().item(0). \ - data(QtCore.Qt.DisplayRole) - - if project_name: - self.local_site = self.sync_server.get_active_site(project_name) - - def _get_icon(self, status): - if not self.icons.get(status): - resource_path = os.path.dirname(__file__) - resource_path = os.path.join(resource_path, "..", - "resources") - pix_url = "{}/{}.png".format(resource_path, status) - icon = QtGui.QIcon(pix_url) - self.icons[status] = icon - else: - icon = self.icons[status] - return icon - - def _on_context_menu(self, point): - point_index = self.project_list.indexAt(point) - if not point_index.isValid(): - return - - self.project_name = point_index.data(QtCore.Qt.DisplayRole) - - menu = QtWidgets.QMenu() - actions_mapping = {} - - if self.sync_server.is_project_paused(self.project_name): - action = QtWidgets.QAction("Unpause") - actions_mapping[action] = self._unpause - else: - action = QtWidgets.QAction("Pause") - actions_mapping[action] = self._pause - menu.addAction(action) - - if self.local_site == get_local_site_id(): - action = QtWidgets.QAction("Clear local project") - actions_mapping[action] = self._clear_project - menu.addAction(action) - - result = menu.exec_(QtGui.QCursor.pos()) - if result: - to_run = actions_mapping[result] - if to_run: - to_run() - - def _pause(self): - if self.project_name: - self.sync_server.pause_project(self.project_name) - self.project_name = None - self.refresh() - - def _unpause(self): - if self.project_name: - self.sync_server.unpause_project(self.project_name) - self.project_name = None - self.refresh() - - def _clear_project(self): - if self.project_name: - self.sync_server.clear_project(self.project_name, self.local_site) - self.project_name = None - self.refresh() - - -class ProjectModel(QtCore.QAbstractListModel): - def __init__(self, *args, projects=None, **kwargs): - super(ProjectModel, self).__init__(*args, **kwargs) - self.projects = projects or [] - - def data(self, index, role): - if role == Qt.DisplayRole: - # See below for the data structure. - status, text = self.projects[index.row()] - # Return the todo text only. - return text - - def rowCount(self, index): - return len(self.todos) - - -class SyncRepresentationWidget(QtWidgets.QWidget): - """ - Summary dialog with list of representations that matches current - settings 'local_site' and 'remote_site'. - """ - active_changed = QtCore.Signal() # active index changed - message_generated = QtCore.Signal(str) - - default_widths = ( - ("asset", 210), - ("subset", 190), - ("version", 10), - ("representation", 90), - ("created_dt", 100), - ("sync_dt", 100), - ("local_site", 60), - ("remote_site", 70), - ("files_count", 70), - ("files_size", 70), - ("priority", 20), - ("state", 50) - ) - - def __init__(self, sync_server, project=None, parent=None): - super(SyncRepresentationWidget, self).__init__(parent) - - self.sync_server = sync_server - - self._selected_id = None # keep last selected _id - self.representation_id = None - self.site_name = None # to pause/unpause representation - - self.filter = QtWidgets.QLineEdit() - self.filter.setPlaceholderText("Filter representations..") - - top_bar_layout = QtWidgets.QHBoxLayout() - top_bar_layout.addWidget(self.filter) - - self.table_view = QtWidgets.QTableView() - headers = [item[0] for item in self.default_widths] - - model = SyncRepresentationModel(sync_server, headers, project) - self.table_view.setModel(model) - self.table_view.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) - self.table_view.setSelectionMode( - QtWidgets.QAbstractItemView.SingleSelection) - self.table_view.setSelectionBehavior( - QtWidgets.QAbstractItemView.SelectRows) - self.table_view.horizontalHeader().setSortIndicator( - -1, Qt.AscendingOrder) - self.table_view.setSortingEnabled(True) - self.table_view.setAlternatingRowColors(True) - self.table_view.verticalHeader().hide() - - time_delegate = PrettyTimeDelegate(self) - column = self.table_view.model().get_header_index("created_dt") - self.table_view.setItemDelegateForColumn(column, time_delegate) - column = self.table_view.model().get_header_index("sync_dt") - self.table_view.setItemDelegateForColumn(column, time_delegate) - - column = self.table_view.model().get_header_index("local_site") - delegate = ImageDelegate(self) - self.table_view.setItemDelegateForColumn(column, delegate) - - column = self.table_view.model().get_header_index("remote_site") - delegate = ImageDelegate(self) - self.table_view.setItemDelegateForColumn(column, delegate) - - column = self.table_view.model().get_header_index("files_size") - delegate = SizeDelegate(self) - self.table_view.setItemDelegateForColumn(column, delegate) - - for column_name, width in self.default_widths: - idx = model.get_header_index(column_name) - self.table_view.setColumnWidth(idx, width) - - layout = QtWidgets.QVBoxLayout(self) - layout.setContentsMargins(0, 0, 0, 0) - layout.addLayout(top_bar_layout) - layout.addWidget(self.table_view) - - self.table_view.doubleClicked.connect(self._double_clicked) - self.filter.textChanged.connect(lambda: model.set_filter( - self.filter.text())) - self.table_view.customContextMenuRequested.connect( - self._on_context_menu) - - self.table_view.model().modelReset.connect(self._set_selection) - - self.selection_model = self.table_view.selectionModel() - self.selection_model.selectionChanged.connect(self._selection_changed) - - def _selection_changed(self, new_selection): - index = self.selection_model.currentIndex() - self._selected_id = \ - self.table_view.model().data(index, Qt.UserRole) - - def _set_selection(self): - """ - Sets selection to 'self._selected_id' if exists. - - Keep selection during model refresh. - """ - if self._selected_id: - index = self.table_view.model().get_index(self._selected_id) - if index and index.isValid(): - mode = QtCore.QItemSelectionModel.Select | \ - QtCore.QItemSelectionModel.Rows - self.selection_model.setCurrentIndex(index, mode) - else: - self._selected_id = None - - def _double_clicked(self, index): - """ - Opens representation dialog with all files after doubleclick - """ - _id = self.table_view.model().data(index, Qt.UserRole) - detail_window = SyncServerDetailWindow( - self.sync_server, _id, self.table_view.model()._project) - detail_window.exec() - - def _on_context_menu(self, point): - """ - Shows menu with loader actions on Right-click. - """ - point_index = self.table_view.indexAt(point) - if not point_index.isValid(): - return - - self.item = self.table_view.model()._data[point_index.row()] - self.representation_id = self.item._id - log.debug("menu representation _id:: {}". - format(self.representation_id)) - - menu = QtWidgets.QMenu() - actions_mapping = {} - - action = QtWidgets.QAction("Open in explorer") - actions_mapping[action] = self._open_in_explorer - menu.addAction(action) - - local_site, local_progress = self.item.local_site.split() - remote_site, remote_progress = self.item.remote_site.split() - local_progress = float(local_progress) - remote_progress = float(remote_progress) - - # progress smaller then 1.0 --> in progress or queued - if local_progress < 1.0: - self.site_name = local_site - else: - self.site_name = remote_site - - if self.item.state in [STATUS[0], STATUS[2]]: - action = QtWidgets.QAction("Pause") - actions_mapping[action] = self._pause - menu.addAction(action) - - if self.item.state == STATUS[3]: - action = QtWidgets.QAction("Unpause") - actions_mapping[action] = self._unpause - menu.addAction(action) - - # if self.item.state == STATUS[1]: - # action = QtWidgets.QAction("Open error detail") - # actions_mapping[action] = self._show_detail - # menu.addAction(action) - - if remote_progress == 1.0: - action = QtWidgets.QAction("Reset local site") - actions_mapping[action] = self._reset_local_site - menu.addAction(action) - - if local_progress == 1.0: - action = QtWidgets.QAction("Reset remote site") - actions_mapping[action] = self._reset_remote_site - menu.addAction(action) - - if local_site != self.sync_server.DEFAULT_SITE: - action = QtWidgets.QAction("Completely remove from local") - actions_mapping[action] = self._remove_site - menu.addAction(action) - else: - action = QtWidgets.QAction("Mark for sync to local") - actions_mapping[action] = self._add_site - menu.addAction(action) - - if not actions_mapping: - action = QtWidgets.QAction("< No action >") - actions_mapping[action] = None - menu.addAction(action) - - result = menu.exec_(QtGui.QCursor.pos()) - if result: - to_run = actions_mapping[result] - if to_run: - to_run() - - self.table_view.model().refresh() - - def _pause(self): - self.sync_server.pause_representation(self.table_view.model()._project, - self.representation_id, - self.site_name) - self.site_name = None - self.message_generated.emit("Paused {}".format(self.representation_id)) - - def _unpause(self): - self.sync_server.unpause_representation( - self.table_view.model()._project, - self.representation_id, - self.site_name) - self.site_name = None - self.message_generated.emit("Unpaused {}".format( - self.representation_id)) - - # temporary here for testing, will be removed TODO - def _add_site(self): - log.info(self.representation_id) - project_name = self.table_view.model()._project - local_site_name = self.sync_server.get_my_local_site() - try: - self.sync_server.add_site( - project_name, - self.representation_id, - local_site_name - ) - self.message_generated.emit( - "Site {} added for {}".format(local_site_name, - self.representation_id)) - except ValueError as exp: - self.message_generated.emit("Error {}".format(str(exp))) - - def _remove_site(self): - """ - Removes site record AND files. - - This is ONLY for representations stored on local site, which - cannot be same as SyncServer.DEFAULT_SITE. - - This could only happen when artist work on local machine, not - connected to studio mounted drives. - """ - log.info("Removing {}".format(self.representation_id)) - try: - local_site = get_local_site_id() - self.sync_server.remove_site( - self.table_view.model()._project, - self.representation_id, - local_site, - True - ) - self.message_generated.emit("Site {} removed".format(local_site)) - except ValueError as exp: - self.message_generated.emit("Error {}".format(str(exp))) - - def _reset_local_site(self): - """ - Removes errors or success metadata for particular file >> forces - redo of upload/download - """ - self.sync_server.reset_provider_for_file( - self.table_view.model()._project, - self.representation_id, - 'local' - ) - - def _reset_remote_site(self): - """ - Removes errors or success metadata for particular file >> forces - redo of upload/download - """ - self.sync_server.reset_provider_for_file( - self.table_view.model()._project, - self.representation_id, - 'remote' - ) - - def _open_in_explorer(self): - if not self.item: - return - - fpath = self.item.path - project = self.table_view.model()._project - fpath = self.sync_server.get_local_file_path(project, fpath) - - fpath = os.path.normpath(os.path.dirname(fpath)) - if os.path.isdir(fpath): - if 'win' in sys.platform: # windows - subprocess.Popen('explorer "%s"' % fpath) - elif sys.platform == 'darwin': # macOS - subprocess.Popen(['open', fpath]) - else: # linux - try: - subprocess.Popen(['xdg-open', fpath]) - except OSError: - raise OSError('unsupported xdg-open call??') - - -class SyncRepresentationModel(QtCore.QAbstractTableModel): - """ - Model for summary of representations. - - Groups files information per representation. Allows sorting and - full text filtering. - - Allows pagination, most of heavy lifting is being done on DB side. - Single model matches to single collection. When project is changed, - model is reset and refreshed. - - Args: - sync_server (SyncServer) - object to call server operations (update - db status, set site status...) - header (list) - names of visible columns - project (string) - collection name, all queries must be called on - a specific collection - - """ - PAGE_SIZE = 20 # default page size to query for - REFRESH_SEC = 5000 # in seconds, requery DB for new status - DEFAULT_SORT = { - "updated_dt_remote": -1, - "_id": 1 - } - SORT_BY_COLUMN = [ - "context.asset", # asset - "context.subset", # subset - "context.version", # version - "context.representation", # representation - "updated_dt_local", # local created_dt - "updated_dt_remote", # remote created_dt - "avg_progress_local", # local progress - "avg_progress_remote", # remote progress - "files_count", # count of files - "files_size", # file size of all files - "context.asset", # priority TODO - "status" # state - ] - - @attr.s - class SyncRepresentation: - """ - Auxiliary object for easier handling. - - Fields must contain all header values (+ any arbitrary values). - """ - _id = attr.ib() - asset = attr.ib() - subset = attr.ib() - version = attr.ib() - representation = attr.ib() - created_dt = attr.ib(default=None) - sync_dt = attr.ib(default=None) - local_site = attr.ib(default=None) - remote_site = attr.ib(default=None) - files_count = attr.ib(default=None) - files_size = attr.ib(default=None) - priority = attr.ib(default=None) - state = attr.ib(default=None) - path = attr.ib(default=None) - - def __init__(self, sync_server, header, project=None): - super(SyncRepresentationModel, self).__init__() - self._header = header - self._data = [] - self._project = project - self._rec_loaded = 0 - self._total_records = 0 # how many documents query actually found - self.filter = None - - self._initialized = False - if not self._project or self._project == DUMMY_PROJECT: - return - - self.sync_server = sync_server - # TODO think about admin mode - # this is for regular user, always only single local and single remote - self.local_site = self.sync_server.get_active_site(self._project) - self.remote_site = self.sync_server.get_remote_site(self._project) - - self.projection = self.get_default_projection() - - self.sort = self.DEFAULT_SORT - - self.query = self.get_default_query() - self.default_query = list(self.get_default_query()) - - representations = self.dbcon.aggregate(self.query) - self.refresh(representations) - - self.timer = QtCore.QTimer() - self.timer.timeout.connect(self.tick) - self.timer.start(self.REFRESH_SEC) - - @property - def dbcon(self): - """ - Database object with preselected project (collection) to run DB - operations (find, aggregate). - - All queries should go through this (because of collection). - """ - return self.sync_server.connection.database[self._project] - - def data(self, index, role): - item = self._data[index.row()] - - if role == Qt.DisplayRole: - return attr.asdict(item)[self._header[index.column()]] - if role == Qt.UserRole: - return item._id - - def rowCount(self, index): - return len(self._data) - - def columnCount(self, index): - return len(self._header) - - def headerData(self, section, orientation, role): - if role == Qt.DisplayRole: - if orientation == Qt.Horizontal: - return str(self._header[section]) - - def tick(self): - """ - Triggers refresh of model. - - Because of pagination, prepared (sorting, filtering) query needs - to be run on DB every X seconds. - """ - self.refresh(representations=None, load_records=self._rec_loaded) - self.timer.start(self.REFRESH_SEC) - - def get_header_index(self, value): - """ - Returns index of 'value' in headers - - Args: - value (str): header name value - Returns: - (int) - """ - return self._header.index(value) - - def refresh(self, representations=None, load_records=0): - """ - Reloads representations from DB if necessary, adds them to model. - - Runs periodically (every X seconds) or by demand (change of - sorting, filtering etc.) - - Emits 'modelReset' signal. - - Args: - representations (PaginationResult object): pass result of - aggregate query from outside - mostly for testing only - load_records (int) - enforces how many records should be - actually queried (scrolled a couple of times to list more - than single page of records) - """ - if self.sync_server.is_paused() or \ - self.sync_server.is_project_paused(self._project): - return - - self.beginResetModel() - self._data = [] - self._rec_loaded = 0 - - if not representations: - self.query = self.get_default_query(load_records) - representations = self.dbcon.aggregate(self.query) - - self._add_page_records(self.local_site, self.remote_site, - representations) - self.endResetModel() - - def _add_page_records(self, local_site, remote_site, representations): - """ - Process all records from 'representation' and add them to storage. - - Args: - local_site (str): name of local site (mine) - remote_site (str): name of cloud provider (theirs) - representations (Mongo Cursor) - mimics result set, 1 object - with paginatedResults array and totalCount array - """ - result = representations.next() - count = 0 - total_count = result.get("totalCount") - if total_count: - count = total_count.pop().get('count') - self._total_records = count - - local_provider = _translate_provider_for_icon(self.sync_server, - self._project, - local_site) - remote_provider = _translate_provider_for_icon(self.sync_server, - self._project, - remote_site) - - for repre in result.get("paginatedResults"): - context = repre.get("context").pop() - files = repre.get("files", []) - if isinstance(files, dict): # aggregate returns dictionary - files = [files] - - # representation without files doesnt concern us - if not files: - continue - - local_updated = remote_updated = None - if repre.get('updated_dt_local'): - local_updated = \ - repre.get('updated_dt_local').strftime("%Y%m%dT%H%M%SZ") - - if repre.get('updated_dt_remote'): - remote_updated = \ - repre.get('updated_dt_remote').strftime("%Y%m%dT%H%M%SZ") - - avg_progress_remote = _convert_progress( - repre.get('avg_progress_remote', '0')) - avg_progress_local = _convert_progress( - repre.get('avg_progress_local', '0')) - - if context.get("version"): - version = "v{:0>3d}".format(context.get("version")) - else: - version = "hero" - - item = self.SyncRepresentation( - repre.get("_id"), - context.get("asset"), - context.get("subset"), - version, - context.get("representation"), - local_updated, - remote_updated, - '{} {}'.format(local_provider, avg_progress_local), - '{} {}'.format(remote_provider, avg_progress_remote), - repre.get("files_count", 1), - repre.get("files_size", 0), - 1, - STATUS[repre.get("status", -1)], - files[0].get('path') - ) - - self._data.append(item) - self._rec_loaded += 1 - - def canFetchMore(self, index): - """ - Check if there are more records than currently loaded - """ - # 'skip' might be suboptimal when representation hits 500k+ - return self._total_records > self._rec_loaded - - def fetchMore(self, index): - """ - Add more record to model. - - Called when 'canFetchMore' returns true, which means there are - more records in DB than loaded. - """ - log.debug("fetchMore") - items_to_fetch = min(self._total_records - self._rec_loaded, - self.PAGE_SIZE) - self.query = self.get_default_query(self._rec_loaded) - representations = self.dbcon.aggregate(self.query) - self.beginInsertRows(index, - self._rec_loaded, - self._rec_loaded + items_to_fetch - 1) - - self._add_page_records(self.local_site, self.remote_site, - representations) - - self.endInsertRows() - - def sort(self, index, order): - """ - Summary sort per representation. - - Sort is happening on a DB side, model is reset, db queried - again. - - Args: - index (int): column index - order (int): 0| - """ - # limit unwanted first re-sorting by view - if index < 0: - return - - self._rec_loaded = 0 - if order == 0: - order = 1 - else: - order = -1 - - self.sort = {self.SORT_BY_COLUMN[index]: order, '_id': 1} - self.query = self.get_default_query() - # import json - # log.debug(json.dumps(self.query, indent=4).replace('False', 'false').\ - # replace('True', 'true').replace('None', 'null')) - - representations = self.dbcon.aggregate(self.query) - self.refresh(representations) - - def set_filter(self, filter): - """ - Adds text value filtering - - Args: - filter (str): string inputted by user - """ - self.filter = filter - self.refresh() - - def set_project(self, project): - """ - Changes project, called after project selection is changed - - Args: - project (str): name of project - """ - self._project = project - self.sync_server.set_sync_project_settings() - self.local_site = self.sync_server.get_active_site(self._project) - self.remote_site = self.sync_server.get_remote_site(self._project) - self.refresh() - - def get_index(self, id): - """ - Get index of 'id' value. - - Used for keeping selection after refresh. - - Args: - id (str): MongoDB _id - Returns: - (QModelIndex) - """ - for i in range(self.rowCount(None)): - index = self.index(i, 0) - value = self.data(index, Qt.UserRole) - if value == id: - return index - return None - - def get_default_query(self, limit=0): - """ - Returns basic aggregate query for main table. - - Main table provides summary information about representation, - which could have multiple files. Details are accessible after - double click on representation row. - Columns: - 'created_dt' - max of created or updated (when failed) per repr - 'sync_dt' - same for remote side - 'local_site' - progress of repr on local side, 1 = finished - 'remote_site' - progress on remote side, calculates from files - 'state' - - 0 - in progress - 1 - failed - 2 - queued - 3 - paused - 4 - finished on both sides - - are calculated and must be calculated in DB because of - pagination - - Args: - limit (int): how many records should be returned, by default - it 'PAGE_SIZE' for performance. - Should be overridden by value of loaded records for refresh - functionality (got more records by scrolling, refresh - shouldn't reset that) - """ - if limit == 0: - limit = SyncRepresentationModel.PAGE_SIZE - - return [ - {"$match": self._get_match_part()}, - {'$unwind': '$files'}, - # merge potentially unwinded records back to single per repre - {'$addFields': { - 'order_remote': { - '$filter': {'input': '$files.sites', 'as': 'p', - 'cond': {'$eq': ['$$p.name', self.remote_site]} - }}, - 'order_local': { - '$filter': {'input': '$files.sites', 'as': 'p', - 'cond': {'$eq': ['$$p.name', self.local_site]} - }} - }}, - {'$addFields': { - # prepare progress per file, presence of 'created_dt' denotes - # successfully finished load/download - 'progress_remote': {'$first': { - '$cond': [{'$size': "$order_remote.progress"}, - "$order_remote.progress", - {'$cond': [ - {'$size': "$order_remote.created_dt"}, - [1], - [0] - ]} - ]}}, - 'progress_local': {'$first': { - '$cond': [{'$size': "$order_local.progress"}, - "$order_local.progress", - {'$cond': [ - {'$size': "$order_local.created_dt"}, - [1], - [0] - ]} - ]}}, - # file might be successfully created or failed, not both - 'updated_dt_remote': {'$first': { - '$cond': [{'$size': "$order_remote.created_dt"}, - "$order_remote.created_dt", - {'$cond': [ - {'$size': "$order_remote.last_failed_dt"}, - "$order_remote.last_failed_dt", - [] - ]} - ]}}, - 'updated_dt_local': {'$first': { - '$cond': [{'$size': "$order_local.created_dt"}, - "$order_local.created_dt", - {'$cond': [ - {'$size': "$order_local.last_failed_dt"}, - "$order_local.last_failed_dt", - [] - ]} - ]}}, - 'files_size': {'$ifNull': ["$files.size", 0]}, - 'failed_remote': { - '$cond': [{'$size': "$order_remote.last_failed_dt"}, - 1, - 0]}, - 'failed_local': { - '$cond': [{'$size': "$order_local.last_failed_dt"}, - 1, - 0]}, - 'failed_local_tries': { - '$cond': [{'$size': '$order_local.tries'}, - {'$first': '$order_local.tries'}, - 0]}, - 'failed_remote_tries': { - '$cond': [{'$size': '$order_remote.tries'}, - {'$first': '$order_remote.tries'}, - 0]}, - 'paused_remote': { - '$cond': [{'$size': "$order_remote.paused"}, - 1, - 0]}, - 'paused_local': { - '$cond': [{'$size': "$order_local.paused"}, - 1, - 0]}, - }}, - {'$group': { - '_id': '$_id', - # pass through context - same for representation - 'context': {'$addToSet': '$context'}, - 'data': {'$addToSet': '$data'}, - # pass through files as a list - 'files': {'$addToSet': '$files'}, - # count how many files - 'files_count': {'$sum': 1}, - 'files_size': {'$sum': '$files_size'}, - # sum avg progress, finished = 1 - 'avg_progress_remote': {'$avg': "$progress_remote"}, - 'avg_progress_local': {'$avg': "$progress_local"}, - # select last touch of file - 'updated_dt_remote': {'$max': "$updated_dt_remote"}, - 'failed_remote': {'$sum': '$failed_remote'}, - 'failed_local': {'$sum': '$failed_local'}, - 'failed_remote_tries': {'$sum': '$failed_remote_tries'}, - 'failed_local_tries': {'$sum': '$failed_local_tries'}, - 'paused_remote': {'$sum': '$paused_remote'}, - 'paused_local': {'$sum': '$paused_local'}, - 'updated_dt_local': {'$max': "$updated_dt_local"} - }}, - {"$project": self.projection}, - {"$sort": self.sort}, - { - '$facet': { - 'paginatedResults': [{'$skip': self._rec_loaded}, - {'$limit': limit}], - 'totalCount': [{'$count': 'count'}] - } - } - ] - - def _get_match_part(self): - """ - Extend match part with filter if present. - - Filter is set by user input. Each model has different fields to be - checked. - If performance issues are found, '$text' and text indexes should - be investigated. - - Fulltext searches in: - context.subset - context.asset - context.representation names AND _id (ObjectId) - """ - base_match = { - "type": "representation", - 'files.sites.name': {'$all': [self.local_site, - self.remote_site]} - } - if not self.filter: - return base_match - else: - regex_str = '.*{}.*'.format(self.filter) - base_match['$or'] = [ - {'context.subset': {'$regex': regex_str, '$options': 'i'}}, - {'context.asset': {'$regex': regex_str, '$options': 'i'}}, - {'context.representation': {'$regex': regex_str, - '$options': 'i'}}] - - if ObjectId.is_valid(self.filter): - base_match['$or'] = [{'_id': ObjectId(self.filter)}] - - return base_match - - def get_default_projection(self): - """ - Projection part for aggregate query. - - All fields with '1' will be returned, no others. - - Returns: - (dict) - """ - return { - "context.subset": 1, - "context.asset": 1, - "context.version": 1, - "context.representation": 1, - "data.path": 1, - "files": 1, - 'files_count': 1, - "files_size": 1, - 'avg_progress_remote': 1, - 'avg_progress_local': 1, - 'updated_dt_remote': 1, - 'updated_dt_local': 1, - 'paused_remote': 1, - 'paused_local': 1, - 'status': { - '$switch': { - 'branches': [ - { - 'case': { - '$or': ['$paused_remote', '$paused_local']}, - 'then': 3 # Paused - }, - { - 'case': { - '$or': [ - {'$gte': ['$failed_local_tries', 3]}, - {'$gte': ['$failed_remote_tries', 3]} - ]}, - 'then': 1}, - { - 'case': { - '$or': [{'$eq': ['$avg_progress_remote', 0]}, - {'$eq': ['$avg_progress_local', 0]}]}, - 'then': 2 # Queued - }, - { - 'case': {'$or': [{'$and': [ - {'$gt': ['$avg_progress_remote', 0]}, - {'$lt': ['$avg_progress_remote', 1]} - ]}, - {'$and': [ - {'$gt': ['$avg_progress_local', 0]}, - {'$lt': ['$avg_progress_local', 1]} - ]} - ]}, - 'then': 0 # In progress - }, - { - 'case': {'$and': [ - {'$eq': ['$avg_progress_remote', 1]}, - {'$eq': ['$avg_progress_local', 1]} - ]}, - 'then': 4 # Synced OK - }, - ], - 'default': -1 - } - } - } - - -class SyncServerDetailWindow(QtWidgets.QDialog): - def __init__(self, sync_server, _id, project, parent=None): - log.debug( - "!!! SyncServerDetailWindow _id:: {}".format(_id)) - super(SyncServerDetailWindow, self).__init__(parent) - self.setWindowFlags(QtCore.Qt.Window) - self.setFocusPolicy(QtCore.Qt.StrongFocus) - - self.setStyleSheet(style.load_stylesheet()) - self.setWindowIcon(QtGui.QIcon(style.app_icon_path())) - self.resize(1000, 400) - - body = QtWidgets.QWidget() - footer = QtWidgets.QWidget() - footer.setFixedHeight(20) - - container = SyncRepresentationDetailWidget(sync_server, _id, project, - parent=self) - body_layout = QtWidgets.QHBoxLayout(body) - body_layout.addWidget(container) - body_layout.setContentsMargins(0, 0, 0, 0) - - self.message = QtWidgets.QLabel() - self.message.hide() - - footer_layout = QtWidgets.QVBoxLayout(footer) - footer_layout.addWidget(self.message) - footer_layout.setContentsMargins(0, 0, 0, 0) - - layout = QtWidgets.QVBoxLayout(self) - layout.addWidget(body) - layout.addWidget(footer) - - self.setLayout(body_layout) - self.setWindowTitle("Sync Representation Detail") - - -class SyncRepresentationDetailWidget(QtWidgets.QWidget): - """ - Widget to display list of synchronizable files for single repre. - - Args: - _id (str): representation _id - project (str): name of project with repre - parent (QDialog): SyncServerDetailWindow - """ - active_changed = QtCore.Signal() # active index changed - - default_widths = ( - ("file", 290), - ("created_dt", 120), - ("sync_dt", 120), - ("local_site", 60), - ("remote_site", 60), - ("size", 60), - ("priority", 20), - ("state", 90) - ) - - def __init__(self, sync_server, _id=None, project=None, parent=None): - super(SyncRepresentationDetailWidget, self).__init__(parent) - - log.debug("Representation_id:{}".format(_id)) - self.representation_id = _id - self.item = None # set to item that mouse was clicked over - self.project = project - - self.sync_server = sync_server - - self._selected_id = None - - self.filter = QtWidgets.QLineEdit() - self.filter.setPlaceholderText("Filter representation..") - - top_bar_layout = QtWidgets.QHBoxLayout() - top_bar_layout.addWidget(self.filter) - - self.table_view = QtWidgets.QTableView() - headers = [item[0] for item in self.default_widths] - - model = SyncRepresentationDetailModel(sync_server, headers, _id, - project) - self.table_view.setModel(model) - self.table_view.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) - self.table_view.setSelectionMode( - QtWidgets.QAbstractItemView.SingleSelection) - self.table_view.setSelectionBehavior( - QtWidgets.QTableView.SelectRows) - self.table_view.horizontalHeader().setSortIndicator(-1, - Qt.AscendingOrder) - self.table_view.setSortingEnabled(True) - self.table_view.setAlternatingRowColors(True) - self.table_view.verticalHeader().hide() - - time_delegate = PrettyTimeDelegate(self) - column = self.table_view.model().get_header_index("created_dt") - self.table_view.setItemDelegateForColumn(column, time_delegate) - column = self.table_view.model().get_header_index("sync_dt") - self.table_view.setItemDelegateForColumn(column, time_delegate) - - column = self.table_view.model().get_header_index("local_site") - delegate = ImageDelegate(self) - self.table_view.setItemDelegateForColumn(column, delegate) - - column = self.table_view.model().get_header_index("remote_site") - delegate = ImageDelegate(self) - self.table_view.setItemDelegateForColumn(column, delegate) - - column = self.table_view.model().get_header_index("size") - delegate = SizeDelegate(self) - self.table_view.setItemDelegateForColumn(column, delegate) - - for column_name, width in self.default_widths: - idx = model.get_header_index(column_name) - self.table_view.setColumnWidth(idx, width) - - layout = QtWidgets.QVBoxLayout(self) - layout.setContentsMargins(0, 0, 0, 0) - layout.addLayout(top_bar_layout) - layout.addWidget(self.table_view) - - self.filter.textChanged.connect(lambda: model.set_filter( - self.filter.text())) - self.table_view.customContextMenuRequested.connect( - self._on_context_menu) - - self.table_view.model().modelReset.connect(self._set_selection) - - self.selection_model = self.table_view.selectionModel() - self.selection_model.selectionChanged.connect(self._selection_changed) - - def _selection_changed(self): - index = self.selection_model.currentIndex() - self._selected_id = self.table_view.model().data(index, Qt.UserRole) - - def _set_selection(self): - """ - Sets selection to 'self._selected_id' if exists. - - Keep selection during model refresh. - """ - if self._selected_id: - index = self.table_view.model().get_index(self._selected_id) - if index.isValid(): - mode = QtCore.QItemSelectionModel.Select | \ - QtCore.QItemSelectionModel.Rows - self.selection_model.setCurrentIndex(index, mode) - else: - self._selected_id = None - - def _show_detail(self): - """ - Shows windows with error message for failed sync of a file. - """ - dt = max(self.item.created_dt, self.item.sync_dt) - detail_window = SyncRepresentationErrorWindow(self.item._id, - self.project, - dt, - self.item.tries, - self.item.error) - detail_window.exec() - - def _on_context_menu(self, point): - """ - Shows menu with loader actions on Right-click. - """ - point_index = self.table_view.indexAt(point) - if not point_index.isValid(): - return - - self.item = self.table_view.model()._data[point_index.row()] - - menu = QtWidgets.QMenu() - actions_mapping = {} - - action = QtWidgets.QAction("Open in explorer") - actions_mapping[action] = self._open_in_explorer - menu.addAction(action) - - if self.item.state == STATUS[1]: - action = QtWidgets.QAction("Open error detail") - actions_mapping[action] = self._show_detail - menu.addAction(action) - - remote_site, remote_progress = self.item.remote_site.split() - if float(remote_progress) == 1.0: - action = QtWidgets.QAction("Reset local site") - actions_mapping[action] = self._reset_local_site - menu.addAction(action) - - local_site, local_progress = self.item.local_site.split() - if float(local_progress) == 1.0: - action = QtWidgets.QAction("Reset remote site") - actions_mapping[action] = self._reset_remote_site - menu.addAction(action) - - if not actions_mapping: - action = QtWidgets.QAction("< No action >") - actions_mapping[action] = None - menu.addAction(action) - - result = menu.exec_(QtGui.QCursor.pos()) - if result: - to_run = actions_mapping[result] - if to_run: - to_run() - - def _reset_local_site(self): - """ - Removes errors or success metadata for particular file >> forces - redo of upload/download - """ - self.sync_server.reset_provider_for_file( - self.table_view.model()._project, - self.representation_id, - 'local', - self.item._id) - self.table_view.model().refresh() - - def _reset_remote_site(self): - """ - Removes errors or success metadata for particular file >> forces - redo of upload/download - """ - self.sync_server.reset_provider_for_file( - self.table_view.model()._project, - self.representation_id, - 'remote', - self.item._id) - self.table_view.model().refresh() - - def _open_in_explorer(self): - if not self.item: - return - - fpath = self.item.path - project = self.table_view.model()._project - fpath = self.sync_server.get_local_file_path(project, fpath) - - fpath = os.path.normpath(os.path.dirname(fpath)) - if os.path.isdir(fpath): - if 'win' in sys.platform: # windows - subprocess.Popen('explorer "%s"' % fpath) - elif sys.platform == 'darwin': # macOS - subprocess.Popen(['open', fpath]) - else: # linux - try: - subprocess.Popen(['xdg-open', fpath]) - except OSError: - raise OSError('unsupported xdg-open call??') - - -class SyncRepresentationDetailModel(QtCore.QAbstractTableModel): - """ - List of all syncronizable files per single representation. - - Used in detail window accessible after clicking on single repre in the - summary. - - Args: - sync_server (SyncServer) - object to call server operations (update - db status, set site status...) - header (list) - names of visible columns - _id (string) - MongoDB _id of representation - project (string) - collection name, all queries must be called on - a specific collection - """ - PAGE_SIZE = 30 - # TODO add filter filename - DEFAULT_SORT = { - "files.path": 1 - } - SORT_BY_COLUMN = [ - "files.path", - "updated_dt_local", # local created_dt - "updated_dt_remote", # remote created_dt - "progress_local", # local progress - "progress_remote", # remote progress - "size", # remote progress - "context.asset", # priority TODO - "status" # state - ] - - @attr.s - class SyncRepresentationDetail: - """ - Auxiliary object for easier handling. - - Fields must contain all header values (+ any arbitrary values). - """ - _id = attr.ib() - file = attr.ib() - created_dt = attr.ib(default=None) - sync_dt = attr.ib(default=None) - local_site = attr.ib(default=None) - remote_site = attr.ib(default=None) - size = attr.ib(default=None) - priority = attr.ib(default=None) - state = attr.ib(default=None) - tries = attr.ib(default=None) - error = attr.ib(default=None) - path = attr.ib(default=None) - - def __init__(self, sync_server, header, _id, project=None): - super(SyncRepresentationDetailModel, self).__init__() - self._header = header - self._data = [] - self._project = project - self._rec_loaded = 0 - self._total_records = 0 # how many documents query actually found - self.filter = None - self._id = _id - self._initialized = False - - self.sync_server = sync_server - # TODO think about admin mode - # this is for regular user, always only single local and single remote - self.local_site = self.sync_server.get_active_site(self._project) - self.remote_site = self.sync_server.get_remote_site(self._project) - - self.sort = self.DEFAULT_SORT - - # in case we would like to hide/show some columns - self.projection = self.get_default_projection() - - self.query = self.get_default_query() - representations = self.dbcon.aggregate(self.query) - self.refresh(representations) - - self.timer = QtCore.QTimer() - self.timer.timeout.connect(self.tick) - self.timer.start(SyncRepresentationModel.REFRESH_SEC) - - @property - def dbcon(self): - return self.sync_server.connection.database[self._project] - - def tick(self): - self.refresh(representations=None, load_records=self._rec_loaded) - self.timer.start(SyncRepresentationModel.REFRESH_SEC) - - def get_header_index(self, value): - """ - Returns index of 'value' in headers - - Args: - value (str): header name value - Returns: - (int) - """ - return self._header.index(value) - - def data(self, index, role): - item = self._data[index.row()] - if role == Qt.DisplayRole: - return attr.asdict(item)[self._header[index.column()]] - if role == Qt.UserRole: - return item._id - - def rowCount(self, index): - return len(self._data) - - def columnCount(self, index): - return len(self._header) - - def headerData(self, section, orientation, role): - if role == Qt.DisplayRole: - if orientation == Qt.Horizontal: - return str(self._header[section]) - - def refresh(self, representations=None, load_records=0): - if self.sync_server.is_paused(): - return - - self.beginResetModel() - self._data = [] - self._rec_loaded = 0 - - if not representations: - self.query = self.get_default_query(load_records) - representations = self.dbcon.aggregate(self.query) - - self._add_page_records(self.local_site, self.remote_site, - representations) - self.endResetModel() - - def _add_page_records(self, local_site, remote_site, representations): - """ - Process all records from 'representation' and add them to storage. - - Args: - local_site (str): name of local site (mine) - remote_site (str): name of cloud provider (theirs) - representations (Mongo Cursor) - mimics result set, 1 object - with paginatedResults array and totalCount array - """ - # representations is a Cursor, get first - result = representations.next() - count = 0 - total_count = result.get("totalCount") - if total_count: - count = total_count.pop().get('count') - self._total_records = count - - local_provider = _translate_provider_for_icon(self.sync_server, - self._project, - local_site) - remote_provider = _translate_provider_for_icon(self.sync_server, - self._project, - remote_site) - - for repre in result.get("paginatedResults"): - # log.info("!!! repre:: {}".format(repre)) - files = repre.get("files", []) - if isinstance(files, dict): # aggregate returns dictionary - files = [files] - - for file in files: - local_updated = remote_updated = None - if repre.get('updated_dt_local'): - local_updated = \ - repre.get('updated_dt_local').strftime( - "%Y%m%dT%H%M%SZ") - - if repre.get('updated_dt_remote'): - remote_updated = \ - repre.get('updated_dt_remote').strftime( - "%Y%m%dT%H%M%SZ") - - progress_remote = _convert_progress( - repre.get('progress_remote', '0')) - progress_local = _convert_progress( - repre.get('progress_local', '0')) - - errors = [] - if repre.get('failed_remote_error'): - errors.append(repre.get('failed_remote_error')) - if repre.get('failed_local_error'): - errors.append(repre.get('failed_local_error')) - - item = self.SyncRepresentationDetail( - file.get("_id"), - os.path.basename(file["path"]), - local_updated, - remote_updated, - '{} {}'.format(local_provider, progress_local), - '{} {}'.format(remote_provider, progress_remote), - file.get('size', 0), - 1, - STATUS[repre.get("status", -1)], - repre.get("tries"), - '\n'.join(errors), - file.get('path') - - ) - self._data.append(item) - self._rec_loaded += 1 - - def canFetchMore(self, index): - """ - Check if there are more records than currently loaded - """ - # 'skip' might be suboptimal when representation hits 500k+ - return self._total_records > self._rec_loaded - - def fetchMore(self, index): - """ - Add more record to model. - - Called when 'canFetchMore' returns true, which means there are - more records in DB than loaded. - 'self._buffer' is used to stash cursor to limit requery - """ - log.debug("fetchMore") - items_to_fetch = min(self._total_records - self._rec_loaded, - self.PAGE_SIZE) - self.query = self.get_default_query(self._rec_loaded) - representations = self.dbcon.aggregate(self.query) - self.beginInsertRows(index, - self._rec_loaded, - self._rec_loaded + items_to_fetch - 1) - - self._add_page_records(self.local_site, self.remote_site, - representations) - - self.endInsertRows() - - def sort(self, index, order): - # limit unwanted first re-sorting by view - if index < 0: - return - - self._rec_loaded = 0 # change sort - reset from start - - if order == 0: - order = 1 - else: - order = -1 - - self.sort = {self.SORT_BY_COLUMN[index]: order} - self.query = self.get_default_query() - - representations = self.dbcon.aggregate(self.query) - self.refresh(representations) - - def set_filter(self, filter): - self.filter = filter - self.refresh() - - def get_index(self, id): - """ - Get index of 'id' value. - - Used for keeping selection after refresh. - - Args: - id (str): MongoDB _id - Returns: - (QModelIndex) - """ - for i in range(self.rowCount(None)): - index = self.index(i, 0) - value = self.data(index, Qt.UserRole) - if value == id: - return index - return None - - def get_default_query(self, limit=0): - """ - Gets query that gets used when no extra sorting, filtering or - projecting is needed. - - Called for basic table view. - - Returns: - [(dict)] - list with single dict - appropriate for aggregate - function for MongoDB - """ - if limit == 0: - limit = SyncRepresentationModel.PAGE_SIZE - - return [ - {"$match": self._get_match_part()}, - {"$unwind": "$files"}, - {'$addFields': { - 'order_remote': { - '$filter': {'input': '$files.sites', 'as': 'p', - 'cond': {'$eq': ['$$p.name', self.remote_site]} - }}, - 'order_local': { - '$filter': {'input': '$files.sites', 'as': 'p', - 'cond': {'$eq': ['$$p.name', self.local_site]} - }} - }}, - {'$addFields': { - # prepare progress per file, presence of 'created_dt' denotes - # successfully finished load/download - 'progress_remote': {'$first': { - '$cond': [{'$size': "$order_remote.progress"}, - "$order_remote.progress", - {'$cond': [ - {'$size': "$order_remote.created_dt"}, - [1], - [0] - ]} - ]}}, - 'progress_local': {'$first': { - '$cond': [{'$size': "$order_local.progress"}, - "$order_local.progress", - {'$cond': [ - {'$size': "$order_local.created_dt"}, - [1], - [0] - ]} - ]}}, - # file might be successfully created or failed, not both - 'updated_dt_remote': {'$first': { - '$cond': [ - {'$size': "$order_remote.created_dt"}, - "$order_remote.created_dt", - { - '$cond': [ - {'$size': "$order_remote.last_failed_dt"}, - "$order_remote.last_failed_dt", - [] - ] - } - ] - }}, - 'updated_dt_local': {'$first': { - '$cond': [ - {'$size': "$order_local.created_dt"}, - "$order_local.created_dt", - { - '$cond': [ - {'$size': "$order_local.last_failed_dt"}, - "$order_local.last_failed_dt", - [] - ] - } - ] - }}, - 'paused_remote': { - '$cond': [{'$size': "$order_remote.paused"}, - 1, - 0]}, - 'paused_local': { - '$cond': [{'$size': "$order_local.paused"}, - 1, - 0]}, - 'failed_remote': { - '$cond': [{'$size': "$order_remote.last_failed_dt"}, - 1, - 0]}, - 'failed_local': { - '$cond': [{'$size': "$order_local.last_failed_dt"}, - 1, - 0]}, - 'failed_remote_error': {'$first': { - '$cond': [{'$size': "$order_remote.error"}, - "$order_remote.error", - [""]]}}, - 'failed_local_error': {'$first': { - '$cond': [{'$size': "$order_local.error"}, - "$order_local.error", - [""]]}}, - 'tries': {'$first': { - '$cond': [ - {'$size': "$order_local.tries"}, - "$order_local.tries", - {'$cond': [ - {'$size': "$order_remote.tries"}, - "$order_remote.tries", - [] - ]} - ]}} - }}, - {"$project": self.projection}, - {"$sort": self.sort}, - { - '$facet': { - 'paginatedResults': [{'$skip': self._rec_loaded}, - {'$limit': limit}], - 'totalCount': [{'$count': 'count'}] - } - } - ] - - def _get_match_part(self): - """ - Returns different content for 'match' portion if filtering by - name is present - - Returns: - (dict) - """ - if not self.filter: - return { - "type": "representation", - "_id": self._id - } - else: - regex_str = '.*{}.*'.format(self.filter) - return { - "type": "representation", - "_id": self._id, - '$or': [{'files.path': {'$regex': regex_str, '$options': 'i'}}] - } - - def get_default_projection(self): - """ - Projection part for aggregate query. - - All fields with '1' will be returned, no others. - - Returns: - (dict) - """ - return { - "files": 1, - 'progress_remote': 1, - 'progress_local': 1, - 'updated_dt_remote': 1, - 'updated_dt_local': 1, - 'paused_remote': 1, - 'paused_local': 1, - 'failed_remote_error': 1, - 'failed_local_error': 1, - 'tries': 1, - 'status': { - '$switch': { - 'branches': [ - { - 'case': { - '$or': ['$paused_remote', '$paused_local']}, - 'then': 3 # Paused - }, - { - 'case': { - '$and': [{'$or': ['$failed_remote', - '$failed_local']}, - {'$eq': ['$tries', 3]}]}, - 'then': 1 # Failed (3 tries) - }, - { - 'case': { - '$or': [{'$eq': ['$progress_remote', 0]}, - {'$eq': ['$progress_local', 0]}]}, - 'then': 2 # Queued - }, - { - 'case': { - '$or': ['$failed_remote', '$failed_local']}, - 'then': 1 # Failed - }, - { - 'case': {'$or': [{'$and': [ - {'$gt': ['$progress_remote', 0]}, - {'$lt': ['$progress_remote', 1]} - ]}, - {'$and': [ - {'$gt': ['$progress_local', 0]}, - {'$lt': ['$progress_local', 1]} - ]} - ]}, - 'then': 0 # In Progress - }, - { - 'case': {'$and': [ - {'$eq': ['$progress_remote', 1]}, - {'$eq': ['$progress_local', 1]} - ]}, - 'then': 4 # Synced OK - }, - ], - 'default': -1 - } - }, - 'data.path': 1 - } - - -class ImageDelegate(QtWidgets.QStyledItemDelegate): - """ - Prints icon of site and progress of synchronization - """ - - def __init__(self, parent=None): - super(ImageDelegate, self).__init__(parent) - self.icons = {} - - def paint(self, painter, option, index): - option = QtWidgets.QStyleOptionViewItem(option) - option.showDecorationSelected = True - - if (option.showDecorationSelected and - (option.state & QtWidgets.QStyle.State_Selected)): - painter.setOpacity(0.20) # highlight color is a bit off - painter.fillRect(option.rect, - option.palette.highlight()) - painter.setOpacity(1) - - d = index.data(QtCore.Qt.DisplayRole) - if d: - provider, value = d.split() - else: - return - - if not self.icons.get(provider): - resource_path = os.path.dirname(__file__) - resource_path = os.path.join(resource_path, "..", - "providers", "resources") - pix_url = "{}/{}.png".format(resource_path, provider) - pixmap = QtGui.QPixmap(pix_url) - self.icons[provider] = pixmap - else: - pixmap = self.icons[provider] - - point = QtCore.QPoint(option.rect.x() + - (option.rect.width() - pixmap.width()) / 2, - option.rect.y() + - (option.rect.height() - pixmap.height()) / 2) - painter.drawPixmap(point, pixmap) - - painter.setOpacity(0.5) - overlay_rect = option.rect - overlay_rect.setHeight(overlay_rect.height() * (1.0 - float(value))) - painter.fillRect(overlay_rect, - QtGui.QBrush(QtGui.QColor(0, 0, 0, 200))) - painter.setOpacity(1) - - -class SyncRepresentationErrorWindow(QtWidgets.QDialog): - def __init__(self, _id, project, dt, tries, msg, parent=None): - super(SyncRepresentationErrorWindow, self).__init__(parent) - self.setWindowFlags(QtCore.Qt.Window) - self.setFocusPolicy(QtCore.Qt.StrongFocus) - - self.setStyleSheet(style.load_stylesheet()) - self.setWindowIcon(QtGui.QIcon(style.app_icon_path())) - self.resize(250, 200) - - body = QtWidgets.QWidget() - footer = QtWidgets.QWidget() - footer.setFixedHeight(20) - - container = SyncRepresentationErrorWidget(_id, project, dt, tries, msg, - parent=self) - body_layout = QtWidgets.QHBoxLayout(body) - body_layout.addWidget(container) - body_layout.setContentsMargins(0, 0, 0, 0) - - message = QtWidgets.QLabel() - message.hide() - - footer_layout = QtWidgets.QVBoxLayout(footer) - footer_layout.addWidget(message) - footer_layout.setContentsMargins(0, 0, 0, 0) - - layout = QtWidgets.QVBoxLayout(self) - layout.addWidget(body) - layout.addWidget(footer) - - self.setLayout(body_layout) - self.setWindowTitle("Sync Representation Error Detail") - - -class SyncRepresentationErrorWidget(QtWidgets.QWidget): - """ - Dialog to show when sync error happened, prints error message - """ - - def __init__(self, _id, project, dt, tries, msg, parent=None): - super(SyncRepresentationErrorWidget, self).__init__(parent) - - layout = QtWidgets.QFormLayout(self) - layout.addRow(QtWidgets.QLabel("Last update date"), - QtWidgets.QLabel(pretty_timestamp(dt))) - layout.addRow(QtWidgets.QLabel("Retries"), - QtWidgets.QLabel(str(tries))) - layout.addRow(QtWidgets.QLabel("Error message"), - QtWidgets.QLabel(msg)) - - -class SizeDelegate(QtWidgets.QStyledItemDelegate): - """ - Pretty print for file size - """ - - def __init__(self, parent=None): - super(SizeDelegate, self).__init__(parent) - - def displayText(self, value, locale): - if value is None: - # Ignore None value - return - - return self._pretty_size(value) - - def _pretty_size(self, value, suffix='B'): - for unit in ['', 'Ki', 'Mi', 'Gi', 'Ti', 'Pi', 'Ei', 'Zi']: - if abs(value) < 1024.0: - return "%3.1f%s%s" % (value, unit, suffix) - value /= 1024.0 - return "%.1f%s%s" % (value, 'Yi', suffix) - - -def _convert_progress(value): - try: - progress = float(value) - except (ValueError, TypeError): - progress = 0.0 - - return progress - - -def _translate_provider_for_icon(sync_server, project, site): - """ - Get provider for 'site' - - This is used for getting icon, 'studio' should have different icon - then local sites, even the provider 'local_drive' is same - - """ - if site == sync_server.DEFAULT_SITE: - return sync_server.DEFAULT_SITE - return sync_server.get_provider_for_site(project, site) diff --git a/openpype/modules/sync_server/tray/lib.py b/openpype/modules/sync_server/tray/lib.py new file mode 100644 index 0000000000..0282d79ea1 --- /dev/null +++ b/openpype/modules/sync_server/tray/lib.py @@ -0,0 +1,52 @@ +from Qt import QtCore + +from openpype.lib import PypeLogger + + +log = PypeLogger().get_logger("SyncServer") + +STATUS = { + 0: 'In Progress', + 1: 'Queued', + 2: 'Failed', + 3: 'Paused', + 4: 'Synced OK', + -1: 'Not available' +} + +DUMMY_PROJECT = "No project configured" + +ProviderRole = QtCore.Qt.UserRole + 2 +ProgressRole = QtCore.Qt.UserRole + 4 +DateRole = QtCore.Qt.UserRole + 6 +FailedRole = QtCore.Qt.UserRole + 8 + + +def pretty_size(value, suffix='B'): + for unit in ['', 'Ki', 'Mi', 'Gi', 'Ti', 'Pi', 'Ei', 'Zi']: + if abs(value) < 1024.0: + return "%3.1f%s%s" % (value, unit, suffix) + value /= 1024.0 + return "%.1f%s%s" % (value, 'Yi', suffix) + + +def convert_progress(value): + try: + progress = float(value) + except (ValueError, TypeError): + progress = 0.0 + + return progress + + +def translate_provider_for_icon(sync_server, project, site): + """ + Get provider for 'site' + + This is used for getting icon, 'studio' should have different icon + then local sites, even the provider 'local_drive' is same + + """ + if site == sync_server.DEFAULT_SITE: + return sync_server.DEFAULT_SITE + return sync_server.get_provider_for_site(project, site) diff --git a/openpype/modules/sync_server/tray/models.py b/openpype/modules/sync_server/tray/models.py new file mode 100644 index 0000000000..3cc53c6ec4 --- /dev/null +++ b/openpype/modules/sync_server/tray/models.py @@ -0,0 +1,1124 @@ +import os +import attr +from bson.objectid import ObjectId + +from Qt import QtCore +from Qt.QtCore import Qt + +from avalon.tools.delegates import pretty_timestamp + +from openpype.lib import PypeLogger + +from openpype.modules.sync_server.tray import lib + + +log = PypeLogger().get_logger("SyncServer") + + +class ProjectModel(QtCore.QAbstractListModel): + def __init__(self, *args, projects=None, **kwargs): + super(ProjectModel, self).__init__(*args, **kwargs) + self.projects = projects or [] + + def data(self, index, role): + if role == Qt.DisplayRole: + # See below for the data structure. + status, text = self.projects[index.row()] + # Return the todo text only. + return text + + def rowCount(self, _index): + return len(self.todos) + + def columnCount(self, _index): + return len(self._header) + + +class _SyncRepresentationModel(QtCore.QAbstractTableModel): + + COLUMN_LABELS = [] + + PAGE_SIZE = 20 # default page size to query for + REFRESH_SEC = 5000 # in seconds, requery DB for new status + + @property + def dbcon(self): + """ + Database object with preselected project (collection) to run DB + operations (find, aggregate). + + All queries should go through this (because of collection). + """ + return self.sync_server.connection.database[self.project] + + @property + def project(self): + """Returns project""" + return self._project + + def rowCount(self, _index): + return len(self._data) + + def columnCount(self, _index): + return len(self._header) + + def headerData(self, section, orientation, role): + if role == Qt.DisplayRole: + if orientation == Qt.Horizontal: + return self.COLUMN_LABELS[section][1] + + def get_header_index(self, value): + """ + Returns index of 'value' in headers + + Args: + value (str): header name value + Returns: + (int) + """ + return self._header.index(value) + + def refresh(self, representations=None, load_records=0): + """ + Reloads representations from DB if necessary, adds them to model. + + Runs periodically (every X seconds) or by demand (change of + sorting, filtering etc.) + + Emits 'modelReset' signal. + + Args: + representations (PaginationResult object): pass result of + aggregate query from outside - mostly for testing only + load_records (int) - enforces how many records should be + actually queried (scrolled a couple of times to list more + than single page of records) + """ + if self.sync_server.is_paused() or \ + self.sync_server.is_project_paused(self.project): + return + self.refresh_started.emit() + self.beginResetModel() + self._data = [] + self._rec_loaded = 0 + + if not representations: + self.query = self.get_default_query(load_records) + representations = self.dbcon.aggregate(self.query) + + self.add_page_records(self.local_site, self.remote_site, + representations) + self.endResetModel() + self.refresh_finished.emit() + + def tick(self): + """ + Triggers refresh of model. + + Because of pagination, prepared (sorting, filtering) query needs + to be run on DB every X seconds. + """ + self.refresh(representations=None, load_records=self._rec_loaded) + self.timer.start(self.REFRESH_SEC) + + def canFetchMore(self, _index): + """ + Check if there are more records than currently loaded + """ + # 'skip' might be suboptimal when representation hits 500k+ + return self._total_records > self._rec_loaded + + def fetchMore(self, index): + """ + Add more record to model. + + Called when 'canFetchMore' returns true, which means there are + more records in DB than loaded. + """ + log.debug("fetchMore") + items_to_fetch = min(self._total_records - self._rec_loaded, + self.PAGE_SIZE) + self.query = self.get_default_query(self._rec_loaded) + representations = self.dbcon.aggregate(self.query) + self.beginInsertRows(index, + self._rec_loaded, + self._rec_loaded + items_to_fetch - 1) + + self.add_page_records(self.local_site, self.remote_site, + representations) + + self.endInsertRows() + + def sort(self, index, order): + """ + Summary sort per representation. + + Sort is happening on a DB side, model is reset, db queried + again. + + Args: + index (int): column index + order (int): 0| + """ + # limit unwanted first re-sorting by view + if index < 0: + return + + self._rec_loaded = 0 + if order == 0: + order = 1 + else: + order = -1 + + self.sort = {self.SORT_BY_COLUMN[index]: order, '_id': 1} + self.query = self.get_default_query() + # import json + # log.debug(json.dumps(self.query, indent=4).\ + # replace('False', 'false').\ + # replace('True', 'true').replace('None', 'null')) + + representations = self.dbcon.aggregate(self.query) + self.refresh(representations) + + def set_filter(self, word_filter): + """ + Adds text value filtering + + Args: + word_filter (str): string inputted by user + """ + self.word_filter = word_filter + self.refresh() + + def set_project(self, project): + """ + Changes project, called after project selection is changed + + Args: + project (str): name of project + """ + self._project = project + self.sync_server.set_sync_project_settings() + self.local_site = self.sync_server.get_active_site(self.project) + self.remote_site = self.sync_server.get_remote_site(self.project) + self.refresh() + + def get_index(self, id): + """ + Get index of 'id' value. + + Used for keeping selection after refresh. + + Args: + id (str): MongoDB _id + Returns: + (QModelIndex) + """ + for i in range(self.rowCount(None)): + index = self.index(i, 0) + value = self.data(index, Qt.UserRole) + if value == id: + return index + return None + + +class SyncRepresentationSummaryModel(_SyncRepresentationModel): + """ + Model for summary of representations. + + Groups files information per representation. Allows sorting and + full text filtering. + + Allows pagination, most of heavy lifting is being done on DB side. + Single model matches to single collection. When project is changed, + model is reset and refreshed. + + Args: + sync_server (SyncServer) - object to call server operations (update + db status, set site status...) + header (list) - names of visible columns + project (string) - collection name, all queries must be called on + a specific collection + + """ + COLUMN_LABELS = [ + ("asset", "Asset"), + ("subset", "Subset"), + ("version", "Version"), + ("representation", "Representation"), + ("local_site", "Active site"), + ("remote_site", "Remote site"), + ("files_count", "Files"), + ("files_size", "Size"), + ("priority", "Priority"), + ("state", "Status") + ] + + DEFAULT_SORT = { + "updated_dt_remote": -1, + "_id": 1 + } + SORT_BY_COLUMN = [ + "context.asset", # asset + "context.subset", # subset + "context.version", # version + "context.representation", # representation + "updated_dt_local", # local created_dt + "updated_dt_remote", # remote created_dt + "files_count", # count of files + "files_size", # file size of all files + "context.asset", # priority TODO + "status" # state + ] + + refresh_started = QtCore.Signal() + refresh_finished = QtCore.Signal() + + @attr.s + class SyncRepresentation: + """ + Auxiliary object for easier handling. + + Fields must contain all header values (+ any arbitrary values). + """ + _id = attr.ib() + asset = attr.ib() + subset = attr.ib() + version = attr.ib() + representation = attr.ib() + created_dt = attr.ib(default=None) + sync_dt = attr.ib(default=None) + local_site = attr.ib(default=None) + remote_site = attr.ib(default=None) + local_provider = attr.ib(default=None) + remote_provider = attr.ib(default=None) + local_progress = attr.ib(default=None) + remote_progress = attr.ib(default=None) + files_count = attr.ib(default=None) + files_size = attr.ib(default=None) + priority = attr.ib(default=None) + state = attr.ib(default=None) + path = attr.ib(default=None) + + def __init__(self, sync_server, header, project=None): + super(SyncRepresentationSummaryModel, self).__init__() + self._header = header + self._data = [] + self._project = project + self._rec_loaded = 0 + self._total_records = 0 # how many documents query actually found + self.word_filter = None + + self._initialized = False + if not self._project or self._project == lib.DUMMY_PROJECT: + return + + self.sync_server = sync_server + # TODO think about admin mode + # this is for regular user, always only single local and single remote + self.local_site = self.sync_server.get_active_site(self.project) + self.remote_site = self.sync_server.get_remote_site(self.project) + + self.projection = self.get_default_projection() + + self.sort = self.DEFAULT_SORT + + self.query = self.get_default_query() + self.default_query = list(self.get_default_query()) + + representations = self.dbcon.aggregate(self.query) + self.refresh(representations) + + self.timer = QtCore.QTimer() + self.timer.timeout.connect(self.tick) + self.timer.start(self.REFRESH_SEC) + + def data(self, index, role): + item = self._data[index.row()] + + header_value = self._header[index.column()] + if role == lib.ProviderRole: + if header_value == 'local_site': + return item.local_provider + if header_value == 'remote_site': + return item.remote_provider + + if role == lib.ProgressRole: + if header_value == 'local_site': + return item.local_progress + if header_value == 'remote_site': + return item.remote_progress + + if role == lib.DateRole: + if header_value == 'local_site': + if item.created_dt: + return pretty_timestamp(item.created_dt) + if header_value == 'remote_site': + if item.sync_dt: + return pretty_timestamp(item.sync_dt) + + if role == lib.FailedRole: + if header_value == 'local_site': + return item.state == lib.STATUS[2] and item.local_progress < 1 + if header_value == 'remote_site': + return item.state == lib.STATUS[2] and item.remote_progress < 1 + + if role == Qt.DisplayRole: + # because of ImageDelegate + if header_value in ['remote_site', 'local_site']: + return "" + + return attr.asdict(item)[self._header[index.column()]] + if role == Qt.UserRole: + return item._id + + def add_page_records(self, local_site, remote_site, representations): + """ + Process all records from 'representation' and add them to storage. + + Args: + local_site (str): name of local site (mine) + remote_site (str): name of cloud provider (theirs) + representations (Mongo Cursor) - mimics result set, 1 object + with paginatedResults array and totalCount array + """ + result = representations.next() + count = 0 + total_count = result.get("totalCount") + if total_count: + count = total_count.pop().get('count') + self._total_records = count + + local_provider = lib.translate_provider_for_icon(self.sync_server, + self.project, + local_site) + remote_provider = lib.translate_provider_for_icon(self.sync_server, + self.project, + remote_site) + + for repre in result.get("paginatedResults"): + context = repre.get("context").pop() + files = repre.get("files", []) + if isinstance(files, dict): # aggregate returns dictionary + files = [files] + + # representation without files doesnt concern us + if not files: + continue + + local_updated = remote_updated = None + if repre.get('updated_dt_local'): + local_updated = \ + repre.get('updated_dt_local').strftime("%Y%m%dT%H%M%SZ") + + if repre.get('updated_dt_remote'): + remote_updated = \ + repre.get('updated_dt_remote').strftime("%Y%m%dT%H%M%SZ") + + avg_progress_remote = lib.convert_progress( + repre.get('avg_progress_remote', '0')) + avg_progress_local = lib.convert_progress( + repre.get('avg_progress_local', '0')) + + if context.get("version"): + version = "v{:0>3d}".format(context.get("version")) + else: + version = "master" + + item = self.SyncRepresentation( + repre.get("_id"), + context.get("asset"), + context.get("subset"), + version, + context.get("representation"), + local_updated, + remote_updated, + local_site, + remote_site, + local_provider, + remote_provider, + avg_progress_local, + avg_progress_remote, + repre.get("files_count", 1), + lib.pretty_size(repre.get("files_size", 0)), + 1, + lib.STATUS[repre.get("status", -1)], + files[0].get('path') + ) + + self._data.append(item) + self._rec_loaded += 1 + + def get_default_query(self, limit=0): + """ + Returns basic aggregate query for main table. + + Main table provides summary information about representation, + which could have multiple files. Details are accessible after + double click on representation row. + Columns: + 'created_dt' - max of created or updated (when failed) per repr + 'sync_dt' - same for remote side + 'local_site' - progress of repr on local side, 1 = finished + 'remote_site' - progress on remote side, calculates from files + 'state' - + 0 - in progress + 1 - failed + 2 - queued + 3 - paused + 4 - finished on both sides + + are calculated and must be calculated in DB because of + pagination + + Args: + limit (int): how many records should be returned, by default + it 'PAGE_SIZE' for performance. + Should be overridden by value of loaded records for refresh + functionality (got more records by scrolling, refresh + shouldn't reset that) + """ + if limit == 0: + limit = SyncRepresentationSummaryModel.PAGE_SIZE + + return [ + {"$match": self.get_match_part()}, + {'$unwind': '$files'}, + # merge potentially unwinded records back to single per repre + {'$addFields': { + 'order_remote': { + '$filter': {'input': '$files.sites', 'as': 'p', + 'cond': {'$eq': ['$$p.name', self.remote_site]} + }}, + 'order_local': { + '$filter': {'input': '$files.sites', 'as': 'p', + 'cond': {'$eq': ['$$p.name', self.local_site]} + }} + }}, + {'$addFields': { + # prepare progress per file, presence of 'created_dt' denotes + # successfully finished load/download + 'progress_remote': {'$first': { + '$cond': [{'$size': "$order_remote.progress"}, + "$order_remote.progress", + {'$cond': [ + {'$size': "$order_remote.created_dt"}, + [1], + [0] + ]} + ]}}, + 'progress_local': {'$first': { + '$cond': [{'$size': "$order_local.progress"}, + "$order_local.progress", + {'$cond': [ + {'$size': "$order_local.created_dt"}, + [1], + [0] + ]} + ]}}, + # file might be successfully created or failed, not both + 'updated_dt_remote': {'$first': { + '$cond': [{'$size': "$order_remote.created_dt"}, + "$order_remote.created_dt", + {'$cond': [ + {'$size': "$order_remote.last_failed_dt"}, + "$order_remote.last_failed_dt", + [] + ]} + ]}}, + 'updated_dt_local': {'$first': { + '$cond': [{'$size': "$order_local.created_dt"}, + "$order_local.created_dt", + {'$cond': [ + {'$size': "$order_local.last_failed_dt"}, + "$order_local.last_failed_dt", + [] + ]} + ]}}, + 'files_size': {'$ifNull': ["$files.size", 0]}, + 'failed_remote': { + '$cond': [{'$size': "$order_remote.last_failed_dt"}, + 1, + 0]}, + 'failed_local': { + '$cond': [{'$size': "$order_local.last_failed_dt"}, + 1, + 0]}, + 'failed_local_tries': { + '$cond': [{'$size': '$order_local.tries'}, + {'$first': '$order_local.tries'}, + 0]}, + 'failed_remote_tries': { + '$cond': [{'$size': '$order_remote.tries'}, + {'$first': '$order_remote.tries'}, + 0]}, + 'paused_remote': { + '$cond': [{'$size': "$order_remote.paused"}, + 1, + 0]}, + 'paused_local': { + '$cond': [{'$size': "$order_local.paused"}, + 1, + 0]}, + }}, + {'$group': { + '_id': '$_id', + # pass through context - same for representation + 'context': {'$addToSet': '$context'}, + 'data': {'$addToSet': '$data'}, + # pass through files as a list + 'files': {'$addToSet': '$files'}, + # count how many files + 'files_count': {'$sum': 1}, + 'files_size': {'$sum': '$files_size'}, + # sum avg progress, finished = 1 + 'avg_progress_remote': {'$avg': "$progress_remote"}, + 'avg_progress_local': {'$avg': "$progress_local"}, + # select last touch of file + 'updated_dt_remote': {'$max': "$updated_dt_remote"}, + 'failed_remote': {'$sum': '$failed_remote'}, + 'failed_local': {'$sum': '$failed_local'}, + 'failed_remote_tries': {'$sum': '$failed_remote_tries'}, + 'failed_local_tries': {'$sum': '$failed_local_tries'}, + 'paused_remote': {'$sum': '$paused_remote'}, + 'paused_local': {'$sum': '$paused_local'}, + 'updated_dt_local': {'$max': "$updated_dt_local"} + }}, + {"$project": self.projection}, + {"$sort": self.sort}, + { + '$facet': { + 'paginatedResults': [{'$skip': self._rec_loaded}, + {'$limit': limit}], + 'totalCount': [{'$count': 'count'}] + } + } + ] + + def get_match_part(self): + """ + Extend match part with word_filter if present. + + Filter is set by user input. Each model has different fields to be + checked. + If performance issues are found, '$text' and text indexes should + be investigated. + + Fulltext searches in: + context.subset + context.asset + context.representation names AND _id (ObjectId) + """ + base_match = { + "type": "representation", + 'files.sites.name': {'$all': [self.local_site, + self.remote_site]} + } + if not self.word_filter: + return base_match + else: + regex_str = '.*{}.*'.format(self.word_filter) + base_match['$or'] = [ + {'context.subset': {'$regex': regex_str, '$options': 'i'}}, + {'context.asset': {'$regex': regex_str, '$options': 'i'}}, + {'context.representation': {'$regex': regex_str, + '$options': 'i'}}] + + if ObjectId.is_valid(self.word_filter): + base_match['$or'] = [{'_id': ObjectId(self.word_filter)}] + + return base_match + + def get_default_projection(self): + """ + Projection part for aggregate query. + + All fields with '1' will be returned, no others. + + Returns: + (dict) + """ + return { + "context.subset": 1, + "context.asset": 1, + "context.version": 1, + "context.representation": 1, + "data.path": 1, + "files": 1, + 'files_count': 1, + "files_size": 1, + 'avg_progress_remote': 1, + 'avg_progress_local': 1, + 'updated_dt_remote': 1, + 'updated_dt_local': 1, + 'paused_remote': 1, + 'paused_local': 1, + 'status': { + '$switch': { + 'branches': [ + { + 'case': { + '$or': ['$paused_remote', '$paused_local']}, + 'then': 3 # Paused + }, + { + 'case': { + '$or': [ + {'$gte': ['$failed_local_tries', 3]}, + {'$gte': ['$failed_remote_tries', 3]} + ]}, + 'then': 2}, # Failed + { + 'case': { + '$or': [{'$eq': ['$avg_progress_remote', 0]}, + {'$eq': ['$avg_progress_local', 0]}]}, + 'then': 1 # Queued + }, + { + 'case': {'$or': [{'$and': [ + {'$gt': ['$avg_progress_remote', 0]}, + {'$lt': ['$avg_progress_remote', 1]} + ]}, + {'$and': [ + {'$gt': ['$avg_progress_local', 0]}, + {'$lt': ['$avg_progress_local', 1]} + ]} + ]}, + 'then': 0 # In progress + }, + { + 'case': {'$and': [ + {'$eq': ['$avg_progress_remote', 1]}, + {'$eq': ['$avg_progress_local', 1]} + ]}, + 'then': 4 # Synced OK + }, + ], + 'default': -1 + } + } + } + + +class SyncRepresentationDetailModel(_SyncRepresentationModel): + """ + List of all syncronizable files per single representation. + + Used in detail window accessible after clicking on single repre in the + summary. + + Args: + sync_server (SyncServer) - object to call server operations (update + db status, set site status...) + header (list) - names of visible columns + _id (string) - MongoDB _id of representation + project (string) - collection name, all queries must be called on + a specific collection + """ + COLUMN_LABELS = [ + ("file", "File name"), + ("local_site", "Active site"), + ("remote_site", "Remote site"), + ("files_size", "Size"), + ("priority", "Priority"), + ("state", "Status") + ] + + PAGE_SIZE = 30 + DEFAULT_SORT = { + "files.path": 1 + } + SORT_BY_COLUMN = [ + "files.path", + "updated_dt_local", # local created_dt + "updated_dt_remote", # remote created_dt + "size", # remote progress + "context.asset", # priority TODO + "status" # state + ] + + refresh_started = QtCore.Signal() + refresh_finished = QtCore.Signal() + + @attr.s + class SyncRepresentationDetail: + """ + Auxiliary object for easier handling. + + Fields must contain all header values (+ any arbitrary values). + """ + _id = attr.ib() + file = attr.ib() + created_dt = attr.ib(default=None) + sync_dt = attr.ib(default=None) + local_site = attr.ib(default=None) + remote_site = attr.ib(default=None) + local_provider = attr.ib(default=None) + remote_provider = attr.ib(default=None) + local_progress = attr.ib(default=None) + remote_progress = attr.ib(default=None) + size = attr.ib(default=None) + priority = attr.ib(default=None) + state = attr.ib(default=None) + tries = attr.ib(default=None) + error = attr.ib(default=None) + path = attr.ib(default=None) + + def __init__(self, sync_server, header, _id, + project=None): + super(SyncRepresentationDetailModel, self).__init__() + self._header = header + self._data = [] + self._project = project + self._rec_loaded = 0 + self._total_records = 0 # how many documents query actually found + self.word_filter = None + self._id = _id + self._initialized = False + + self.sync_server = sync_server + # TODO think about admin mode + # this is for regular user, always only single local and single remote + self.local_site = self.sync_server.get_active_site(self.project) + self.remote_site = self.sync_server.get_remote_site(self.project) + + self.sort = self.DEFAULT_SORT + + # in case we would like to hide/show some columns + self.projection = self.get_default_projection() + + self.query = self.get_default_query() + representations = self.dbcon.aggregate(self.query) + self.refresh(representations) + + self.timer = QtCore.QTimer() + self.timer.timeout.connect(self.tick) + self.timer.start(SyncRepresentationSummaryModel.REFRESH_SEC) + + def data(self, index, role): + item = self._data[index.row()] + + header_value = self._header[index.column()] + if role == lib.ProviderRole: + if header_value == 'local_site': + return item.local_provider + if header_value == 'remote_site': + return item.remote_provider + + if role == lib.ProgressRole: + if header_value == 'local_site': + return item.local_progress + if header_value == 'remote_site': + return item.remote_progress + + if role == lib.DateRole: + if header_value == 'local_site': + if item.created_dt: + return pretty_timestamp(item.created_dt) + if header_value == 'remote_site': + if item.sync_dt: + return pretty_timestamp(item.sync_dt) + + if role == lib.FailedRole: + if header_value == 'local_site': + return item.state == lib.STATUS[2] and item.local_progress < 1 + if header_value == 'remote_site': + return item.state == lib.STATUS[2] and item.remote_progress < 1 + + if role == Qt.DisplayRole: + # because of ImageDelegate + if header_value in ['remote_site', 'local_site']: + return "" + return attr.asdict(item)[self._header[index.column()]] + if role == Qt.UserRole: + return item._id + + def add_page_records(self, local_site, remote_site, representations): + """ + Process all records from 'representation' and add them to storage. + + Args: + local_site (str): name of local site (mine) + remote_site (str): name of cloud provider (theirs) + representations (Mongo Cursor) - mimics result set, 1 object + with paginatedResults array and totalCount array + """ + # representations is a Cursor, get first + result = representations.next() + count = 0 + total_count = result.get("totalCount") + if total_count: + count = total_count.pop().get('count') + self._total_records = count + + local_provider = lib.translate_provider_for_icon(self.sync_server, + self.project, + local_site) + remote_provider = lib.translate_provider_for_icon(self.sync_server, + self.project, + remote_site) + + for repre in result.get("paginatedResults"): + # log.info("!!! repre:: {}".format(repre)) + files = repre.get("files", []) + if isinstance(files, dict): # aggregate returns dictionary + files = [files] + + for file in files: + local_updated = remote_updated = None + if repre.get('updated_dt_local'): + local_updated = \ + repre.get('updated_dt_local').strftime( + "%Y%m%dT%H%M%SZ") + + if repre.get('updated_dt_remote'): + remote_updated = \ + repre.get('updated_dt_remote').strftime( + "%Y%m%dT%H%M%SZ") + + remote_progress = lib.convert_progress( + repre.get('progress_remote', '0')) + local_progress = lib.convert_progress( + repre.get('progress_local', '0')) + + errors = [] + if repre.get('failed_remote_error'): + errors.append(repre.get('failed_remote_error')) + if repre.get('failed_local_error'): + errors.append(repre.get('failed_local_error')) + + item = self.SyncRepresentationDetail( + file.get("_id"), + os.path.basename(file["path"]), + local_updated, + remote_updated, + local_site, + remote_site, + local_provider, + remote_provider, + local_progress, + remote_progress, + lib.pretty_size(file.get('size', 0)), + 1, + lib.STATUS[repre.get("status", -1)], + repre.get("tries"), + '\n'.join(errors), + file.get('path') + + ) + self._data.append(item) + self._rec_loaded += 1 + + def get_default_query(self, limit=0): + """ + Gets query that gets used when no extra sorting, filtering or + projecting is needed. + + Called for basic table view. + + Returns: + [(dict)] - list with single dict - appropriate for aggregate + function for MongoDB + """ + if limit == 0: + limit = SyncRepresentationSummaryModel.PAGE_SIZE + + return [ + {"$match": self.get_match_part()}, + {"$unwind": "$files"}, + {'$addFields': { + 'order_remote': { + '$filter': {'input': '$files.sites', 'as': 'p', + 'cond': {'$eq': ['$$p.name', self.remote_site]} + }}, + 'order_local': { + '$filter': {'input': '$files.sites', 'as': 'p', + 'cond': {'$eq': ['$$p.name', self.local_site]} + }} + }}, + {'$addFields': { + # prepare progress per file, presence of 'created_dt' denotes + # successfully finished load/download + 'progress_remote': {'$first': { + '$cond': [{'$size': "$order_remote.progress"}, + "$order_remote.progress", + {'$cond': [ + {'$size': "$order_remote.created_dt"}, + [1], + [0] + ]} + ]}}, + 'progress_local': {'$first': { + '$cond': [{'$size': "$order_local.progress"}, + "$order_local.progress", + {'$cond': [ + {'$size': "$order_local.created_dt"}, + [1], + [0] + ]} + ]}}, + # file might be successfully created or failed, not both + 'updated_dt_remote': {'$first': { + '$cond': [ + {'$size': "$order_remote.created_dt"}, + "$order_remote.created_dt", + { + '$cond': [ + {'$size': "$order_remote.last_failed_dt"}, + "$order_remote.last_failed_dt", + [] + ] + } + ] + }}, + 'updated_dt_local': {'$first': { + '$cond': [ + {'$size': "$order_local.created_dt"}, + "$order_local.created_dt", + { + '$cond': [ + {'$size': "$order_local.last_failed_dt"}, + "$order_local.last_failed_dt", + [] + ] + } + ] + }}, + 'paused_remote': { + '$cond': [{'$size': "$order_remote.paused"}, + 1, + 0]}, + 'paused_local': { + '$cond': [{'$size': "$order_local.paused"}, + 1, + 0]}, + 'failed_remote': { + '$cond': [{'$size': "$order_remote.last_failed_dt"}, + 1, + 0]}, + 'failed_local': { + '$cond': [{'$size': "$order_local.last_failed_dt"}, + 1, + 0]}, + 'failed_remote_error': {'$first': { + '$cond': [{'$size': "$order_remote.error"}, + "$order_remote.error", + [""]]}}, + 'failed_local_error': {'$first': { + '$cond': [{'$size': "$order_local.error"}, + "$order_local.error", + [""]]}}, + 'tries': {'$first': { + '$cond': [ + {'$size': "$order_local.tries"}, + "$order_local.tries", + {'$cond': [ + {'$size': "$order_remote.tries"}, + "$order_remote.tries", + [] + ]} + ]}} + }}, + {"$project": self.projection}, + {"$sort": self.sort}, + { + '$facet': { + 'paginatedResults': [{'$skip': self._rec_loaded}, + {'$limit': limit}], + 'totalCount': [{'$count': 'count'}] + } + } + ] + + def get_match_part(self): + """ + Returns different content for 'match' portion if filtering by + name is present + + Returns: + (dict) + """ + if not self.word_filter: + return { + "type": "representation", + "_id": self._id + } + else: + regex_str = '.*{}.*'.format(self.word_filter) + return { + "type": "representation", + "_id": self._id, + '$or': [{'files.path': {'$regex': regex_str, '$options': 'i'}}] + } + + def get_default_projection(self): + """ + Projection part for aggregate query. + + All fields with '1' will be returned, no others. + + Returns: + (dict) + """ + return { + "files": 1, + 'progress_remote': 1, + 'progress_local': 1, + 'updated_dt_remote': 1, + 'updated_dt_local': 1, + 'paused_remote': 1, + 'paused_local': 1, + 'failed_remote_error': 1, + 'failed_local_error': 1, + 'tries': 1, + 'status': { + '$switch': { + 'branches': [ + { + 'case': { + '$or': ['$paused_remote', '$paused_local']}, + 'then': 3 # Paused + }, + { + 'case': { + '$and': [{'$or': ['$failed_remote', + '$failed_local']}, + {'$eq': ['$tries', 3]}]}, + 'then': 2 # Failed (3 tries) + }, + { + 'case': { + '$or': [{'$eq': ['$progress_remote', 0]}, + {'$eq': ['$progress_local', 0]}]}, + 'then': 1 # Queued + }, + { + 'case': { + '$or': ['$failed_remote', '$failed_local']}, + 'then': 2 # Failed + }, + { + 'case': {'$or': [{'$and': [ + {'$gt': ['$progress_remote', 0]}, + {'$lt': ['$progress_remote', 1]} + ]}, + {'$and': [ + {'$gt': ['$progress_local', 0]}, + {'$lt': ['$progress_local', 1]} + ]} + ]}, + 'then': 0 # In Progress + }, + { + 'case': {'$and': [ + {'$eq': ['$progress_remote', 1]}, + {'$eq': ['$progress_local', 1]} + ]}, + 'then': 4 # Synced OK + }, + ], + 'default': -1 + } + }, + 'data.path': 1 + } diff --git a/openpype/modules/sync_server/tray/widgets.py b/openpype/modules/sync_server/tray/widgets.py new file mode 100644 index 0000000000..5071ffa2b0 --- /dev/null +++ b/openpype/modules/sync_server/tray/widgets.py @@ -0,0 +1,820 @@ +import os +import subprocess +import sys + +from Qt import QtWidgets, QtCore, QtGui +from Qt.QtCore import Qt + +from openpype.tools.settings import ( + ProjectListWidget, + style +) + +from openpype.api import get_local_site_id +from openpype.lib import PypeLogger + +from avalon.tools.delegates import pretty_timestamp + +from openpype.modules.sync_server.tray.models import ( + SyncRepresentationSummaryModel, + SyncRepresentationDetailModel +) + +from openpype.modules.sync_server.tray import lib + +log = PypeLogger().get_logger("SyncServer") + + +class SyncProjectListWidget(ProjectListWidget): + """ + Lists all projects that are synchronized to choose from + """ + + def __init__(self, sync_server, parent): + super(SyncProjectListWidget, self).__init__(parent) + self.sync_server = sync_server + self.project_list.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) + self.project_list.customContextMenuRequested.connect( + self._on_context_menu) + self.project_name = None + self.local_site = None + self.icons = {} + + def validate_context_change(self): + return True + + def refresh(self): + model = self.project_list.model() + model.clear() + + project_name = None + for project_name in self.sync_server.sync_project_settings.\ + keys(): + if self.sync_server.is_paused() or \ + self.sync_server.is_project_paused(project_name): + icon = self._get_icon("paused") + else: + icon = self._get_icon("synced") + + model.appendRow(QtGui.QStandardItem(icon, project_name)) + + if len(self.sync_server.sync_project_settings.keys()) == 0: + model.appendRow(QtGui.QStandardItem(lib.DUMMY_PROJECT)) + + self.current_project = self.project_list.currentIndex().data( + QtCore.Qt.DisplayRole + ) + if not self.current_project: + self.current_project = self.project_list.model().item(0). \ + data(QtCore.Qt.DisplayRole) + + if project_name: + self.local_site = self.sync_server.get_active_site(project_name) + + def _get_icon(self, status): + if not self.icons.get(status): + resource_path = os.path.dirname(__file__) + resource_path = os.path.join(resource_path, "..", + "resources") + pix_url = "{}/{}.png".format(resource_path, status) + icon = QtGui.QIcon(pix_url) + self.icons[status] = icon + else: + icon = self.icons[status] + return icon + + def _on_context_menu(self, point): + point_index = self.project_list.indexAt(point) + if not point_index.isValid(): + return + + self.project_name = point_index.data(QtCore.Qt.DisplayRole) + + menu = QtWidgets.QMenu() + menu.setStyleSheet(style.load_stylesheet()) + actions_mapping = {} + + if self.sync_server.is_project_paused(self.project_name): + action = QtWidgets.QAction("Unpause") + actions_mapping[action] = self._unpause + else: + action = QtWidgets.QAction("Pause") + actions_mapping[action] = self._pause + menu.addAction(action) + + if self.local_site == get_local_site_id(): + action = QtWidgets.QAction("Clear local project") + actions_mapping[action] = self._clear_project + menu.addAction(action) + + result = menu.exec_(QtGui.QCursor.pos()) + if result: + to_run = actions_mapping[result] + if to_run: + to_run() + + def _pause(self): + if self.project_name: + self.sync_server.pause_project(self.project_name) + self.project_name = None + self.refresh() + + def _unpause(self): + if self.project_name: + self.sync_server.unpause_project(self.project_name) + self.project_name = None + self.refresh() + + def _clear_project(self): + if self.project_name: + self.sync_server.clear_project(self.project_name, self.local_site) + self.project_name = None + self.refresh() + + +class SyncRepresentationWidget(QtWidgets.QWidget): + """ + Summary dialog with list of representations that matches current + settings 'local_site' and 'remote_site'. + """ + active_changed = QtCore.Signal() # active index changed + message_generated = QtCore.Signal(str) + + default_widths = ( + ("asset", 220), + ("subset", 190), + ("version", 55), + ("representation", 95), + ("local_site", 170), + ("remote_site", 170), + ("files_count", 50), + ("files_size", 60), + ("priority", 50), + ("state", 110) + ) + + def __init__(self, sync_server, project=None, parent=None): + super(SyncRepresentationWidget, self).__init__(parent) + + self.sync_server = sync_server + + self._selected_id = None # keep last selected _id + self.representation_id = None + self.site_name = None # to pause/unpause representation + + self.filter = QtWidgets.QLineEdit() + self.filter.setPlaceholderText("Filter representations..") + + self._scrollbar_pos = None + + top_bar_layout = QtWidgets.QHBoxLayout() + top_bar_layout.addWidget(self.filter) + + self.table_view = QtWidgets.QTableView() + headers = [item[0] for item in self.default_widths] + + model = SyncRepresentationSummaryModel(sync_server, headers, project) + self.table_view.setModel(model) + self.table_view.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) + self.table_view.setSelectionMode( + QtWidgets.QAbstractItemView.SingleSelection) + self.table_view.setSelectionBehavior( + QtWidgets.QAbstractItemView.SelectRows) + self.table_view.horizontalHeader().setSortIndicator( + -1, Qt.AscendingOrder) + self.table_view.setSortingEnabled(True) + self.table_view.horizontalHeader().setSortIndicatorShown(True) + self.table_view.setAlternatingRowColors(True) + self.table_view.verticalHeader().hide() + + column = self.table_view.model().get_header_index("local_site") + delegate = ImageDelegate(self) + self.table_view.setItemDelegateForColumn(column, delegate) + + column = self.table_view.model().get_header_index("remote_site") + delegate = ImageDelegate(self) + self.table_view.setItemDelegateForColumn(column, delegate) + + for column_name, width in self.default_widths: + idx = model.get_header_index(column_name) + self.table_view.setColumnWidth(idx, width) + + layout = QtWidgets.QVBoxLayout(self) + layout.setContentsMargins(0, 0, 0, 0) + layout.addLayout(top_bar_layout) + layout.addWidget(self.table_view) + + self.table_view.doubleClicked.connect(self._double_clicked) + self.filter.textChanged.connect(lambda: model.set_filter( + self.filter.text())) + self.table_view.customContextMenuRequested.connect( + self._on_context_menu) + + model.refresh_started.connect(self._save_scrollbar) + model.refresh_finished.connect(self._set_scrollbar) + self.table_view.model().modelReset.connect(self._set_selection) + + self.selection_model = self.table_view.selectionModel() + self.selection_model.selectionChanged.connect(self._selection_changed) + + def _selection_changed(self, _new_selection): + index = self.selection_model.currentIndex() + self._selected_id = \ + self.table_view.model().data(index, Qt.UserRole) + + def _set_selection(self): + """ + Sets selection to 'self._selected_id' if exists. + + Keep selection during model refresh. + """ + if self._selected_id: + index = self.table_view.model().get_index(self._selected_id) + if index and index.isValid(): + mode = QtCore.QItemSelectionModel.Select | \ + QtCore.QItemSelectionModel.Rows + self.selection_model.setCurrentIndex(index, mode) + else: + self._selected_id = None + + def _double_clicked(self, index): + """ + Opens representation dialog with all files after doubleclick + """ + _id = self.table_view.model().data(index, Qt.UserRole) + detail_window = SyncServerDetailWindow( + self.sync_server, _id, self.table_view.model().project) + detail_window.exec() + + def _on_context_menu(self, point): + """ + Shows menu with loader actions on Right-click. + """ + point_index = self.table_view.indexAt(point) + if not point_index.isValid(): + return + + self.item = self.table_view.model()._data[point_index.row()] + self.representation_id = self.item._id + log.debug("menu representation _id:: {}". + format(self.representation_id)) + + menu = QtWidgets.QMenu() + menu.setStyleSheet(style.load_stylesheet()) + actions_mapping = {} + actions_kwargs_mapping = {} + + local_site = self.item.local_site + local_progress = self.item.local_progress + remote_site = self.item.remote_site + remote_progress = self.item.remote_progress + + for site, progress in {local_site: local_progress, + remote_site: remote_progress}.items(): + project = self.table_view.model().project + provider = self.sync_server.get_provider_for_site(project, + site) + if provider == 'local_drive': + if 'studio' in site: + txt = " studio version" + else: + txt = " local version" + action = QtWidgets.QAction("Open in explorer" + txt) + if progress == 1.0: + actions_mapping[action] = self._open_in_explorer + actions_kwargs_mapping[action] = {'site': site} + menu.addAction(action) + + # progress smaller then 1.0 --> in progress or queued + if local_progress < 1.0: + self.site_name = local_site + else: + self.site_name = remote_site + + if self.item.state in [lib.STATUS[0], lib.STATUS[1]]: + action = QtWidgets.QAction("Pause") + actions_mapping[action] = self._pause + menu.addAction(action) + + if self.item.state == lib.STATUS[3]: + action = QtWidgets.QAction("Unpause") + actions_mapping[action] = self._unpause + menu.addAction(action) + + # if self.item.state == lib.STATUS[1]: + # action = QtWidgets.QAction("Open error detail") + # actions_mapping[action] = self._show_detail + # menu.addAction(action) + + if remote_progress == 1.0: + action = QtWidgets.QAction("Re-sync Active site") + actions_mapping[action] = self._reset_local_site + menu.addAction(action) + + if local_progress == 1.0: + action = QtWidgets.QAction("Re-sync Remote site") + actions_mapping[action] = self._reset_remote_site + menu.addAction(action) + + if local_site != self.sync_server.DEFAULT_SITE: + action = QtWidgets.QAction("Completely remove from local") + actions_mapping[action] = self._remove_site + menu.addAction(action) + else: + action = QtWidgets.QAction("Mark for sync to local") + actions_mapping[action] = self._add_site + menu.addAction(action) + + if not actions_mapping: + action = QtWidgets.QAction("< No action >") + actions_mapping[action] = None + menu.addAction(action) + + result = menu.exec_(QtGui.QCursor.pos()) + if result: + to_run = actions_mapping[result] + to_run_kwargs = actions_kwargs_mapping.get(result, {}) + if to_run: + to_run(**to_run_kwargs) + + self.table_view.model().refresh() + + def _pause(self): + self.sync_server.pause_representation(self.table_view.model().project, + self.representation_id, + self.site_name) + self.site_name = None + self.message_generated.emit("Paused {}".format(self.representation_id)) + + def _unpause(self): + self.sync_server.unpause_representation( + self.table_view.model().project, + self.representation_id, + self.site_name) + self.site_name = None + self.message_generated.emit("Unpaused {}".format( + self.representation_id)) + + # temporary here for testing, will be removed TODO + def _add_site(self): + log.info(self.representation_id) + project_name = self.table_view.model().project + local_site_name = get_local_site_id() + try: + self.sync_server.add_site( + project_name, + self.representation_id, + local_site_name + ) + self.message_generated.emit( + "Site {} added for {}".format(local_site_name, + self.representation_id)) + except ValueError as exp: + self.message_generated.emit("Error {}".format(str(exp))) + + def _remove_site(self): + """ + Removes site record AND files. + + This is ONLY for representations stored on local site, which + cannot be same as SyncServer.DEFAULT_SITE. + + This could only happen when artist work on local machine, not + connected to studio mounted drives. + """ + log.info("Removing {}".format(self.representation_id)) + try: + local_site = get_local_site_id() + self.sync_server.remove_site( + self.table_view.model().project, + self.representation_id, + local_site, + True) + self.message_generated.emit("Site {} removed".format(local_site)) + except ValueError as exp: + self.message_generated.emit("Error {}".format(str(exp))) + self.table_view.model().refresh( + load_records=self.table_view.model()._rec_loaded) + + def _reset_local_site(self): + """ + Removes errors or success metadata for particular file >> forces + redo of upload/download + """ + self.sync_server.reset_provider_for_file( + self.table_view.model().project, + self.representation_id, + 'local') + self.table_view.model().refresh( + load_records=self.table_view.model()._rec_loaded) + + def _reset_remote_site(self): + """ + Removes errors or success metadata for particular file >> forces + redo of upload/download + """ + self.sync_server.reset_provider_for_file( + self.table_view.model().project, + self.representation_id, + 'remote') + self.table_view.model().refresh( + load_records=self.table_view.model()._rec_loaded) + + def _open_in_explorer(self, site): + if not self.item: + return + + fpath = self.item.path + project = self.table_view.model().project + fpath = self.sync_server.get_local_file_path(project, + site, + fpath) + + fpath = os.path.normpath(os.path.dirname(fpath)) + if os.path.isdir(fpath): + if 'win' in sys.platform: # windows + subprocess.Popen('explorer "%s"' % fpath) + elif sys.platform == 'darwin': # macOS + subprocess.Popen(['open', fpath]) + else: # linux + try: + subprocess.Popen(['xdg-open', fpath]) + except OSError: + raise OSError('unsupported xdg-open call??') + + def _save_scrollbar(self): + self._scrollbar_pos = self.table_view.verticalScrollBar().value() + + def _set_scrollbar(self): + if self._scrollbar_pos: + self.table_view.verticalScrollBar().setValue(self._scrollbar_pos) + + +class SyncRepresentationDetailWidget(QtWidgets.QWidget): + """ + Widget to display list of synchronizable files for single repre. + + Args: + _id (str): representation _id + project (str): name of project with repre + parent (QDialog): SyncServerDetailWindow + """ + active_changed = QtCore.Signal() # active index changed + + default_widths = ( + ("file", 290), + ("local_site", 185), + ("remote_site", 185), + ("size", 60), + ("priority", 25), + ("state", 110) + ) + + def __init__(self, sync_server, _id=None, project=None, parent=None): + super(SyncRepresentationDetailWidget, self).__init__(parent) + + log.debug("Representation_id:{}".format(_id)) + self.representation_id = _id + self.item = None # set to item that mouse was clicked over + self.project = project + + self.sync_server = sync_server + + self._selected_id = None + + self.filter = QtWidgets.QLineEdit() + self.filter.setPlaceholderText("Filter representation..") + + self._scrollbar_pos = None + + top_bar_layout = QtWidgets.QHBoxLayout() + top_bar_layout.addWidget(self.filter) + + self.table_view = QtWidgets.QTableView() + headers = [item[0] for item in self.default_widths] + + model = SyncRepresentationDetailModel(sync_server, headers, _id, + project) + self.table_view.setModel(model) + self.table_view.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) + self.table_view.setSelectionMode( + QtWidgets.QAbstractItemView.SingleSelection) + self.table_view.setSelectionBehavior( + QtWidgets.QTableView.SelectRows) + self.table_view.horizontalHeader().setSortIndicator(-1, + Qt.AscendingOrder) + self.table_view.setSortingEnabled(True) + self.table_view.horizontalHeader().setSortIndicatorShown(True) + self.table_view.setAlternatingRowColors(True) + self.table_view.verticalHeader().hide() + + column = self.table_view.model().get_header_index("local_site") + delegate = ImageDelegate(self) + self.table_view.setItemDelegateForColumn(column, delegate) + + column = self.table_view.model().get_header_index("remote_site") + delegate = ImageDelegate(self) + self.table_view.setItemDelegateForColumn(column, delegate) + + for column_name, width in self.default_widths: + idx = model.get_header_index(column_name) + self.table_view.setColumnWidth(idx, width) + + layout = QtWidgets.QVBoxLayout(self) + layout.setContentsMargins(0, 0, 0, 0) + layout.addLayout(top_bar_layout) + layout.addWidget(self.table_view) + + self.filter.textChanged.connect(lambda: model.set_filter( + self.filter.text())) + self.table_view.customContextMenuRequested.connect( + self._on_context_menu) + + model.refresh_started.connect(self._save_scrollbar) + model.refresh_finished.connect(self._set_scrollbar) + self.table_view.model().modelReset.connect(self._set_selection) + + self.selection_model = self.table_view.selectionModel() + self.selection_model.selectionChanged.connect(self._selection_changed) + + def _selection_changed(self): + index = self.selection_model.currentIndex() + self._selected_id = self.table_view.model().data(index, Qt.UserRole) + + def _set_selection(self): + """ + Sets selection to 'self._selected_id' if exists. + + Keep selection during model refresh. + """ + if self._selected_id: + index = self.table_view.model().get_index(self._selected_id) + if index and index.isValid(): + mode = QtCore.QItemSelectionModel.Select | \ + QtCore.QItemSelectionModel.Rows + self.selection_model.setCurrentIndex(index, mode) + else: + self._selected_id = None + + def _show_detail(self): + """ + Shows windows with error message for failed sync of a file. + """ + dt = max(self.item.created_dt, self.item.sync_dt) + detail_window = SyncRepresentationErrorWindow(self.item._id, + self.project, + dt, + self.item.tries, + self.item.error) + detail_window.exec() + + def _on_context_menu(self, point): + """ + Shows menu with loader actions on Right-click. + """ + point_index = self.table_view.indexAt(point) + if not point_index.isValid(): + return + + self.item = self.table_view.model()._data[point_index.row()] + + menu = QtWidgets.QMenu() + menu.setStyleSheet(style.load_stylesheet()) + actions_mapping = {} + actions_kwargs_mapping = {} + + local_site = self.item.local_site + local_progress = self.item.local_progress + remote_site = self.item.remote_site + remote_progress = self.item.remote_progress + + for site, progress in {local_site: local_progress, + remote_site: remote_progress}.items(): + project = self.table_view.model().project + provider = self.sync_server.get_provider_for_site(project, + site) + if provider == 'local_drive': + if 'studio' in site: + txt = " studio version" + else: + txt = " local version" + action = QtWidgets.QAction("Open in explorer" + txt) + if progress == 1: + actions_mapping[action] = self._open_in_explorer + actions_kwargs_mapping[action] = {'site': site} + menu.addAction(action) + + if self.item.state == lib.STATUS[2]: + action = QtWidgets.QAction("Open error detail") + actions_mapping[action] = self._show_detail + menu.addAction(action) + + if float(remote_progress) == 1.0: + action = QtWidgets.QAction("Re-sync active site") + actions_mapping[action] = self._reset_local_site + menu.addAction(action) + + if float(local_progress) == 1.0: + action = QtWidgets.QAction("Re-sync remote site") + actions_mapping[action] = self._reset_remote_site + menu.addAction(action) + + if not actions_mapping: + action = QtWidgets.QAction("< No action >") + actions_mapping[action] = None + menu.addAction(action) + + result = menu.exec_(QtGui.QCursor.pos()) + if result: + to_run = actions_mapping[result] + to_run_kwargs = actions_kwargs_mapping.get(result, {}) + if to_run: + to_run(**to_run_kwargs) + + def _reset_local_site(self): + """ + Removes errors or success metadata for particular file >> forces + redo of upload/download + """ + self.sync_server.reset_provider_for_file( + self.table_view.model().project, + self.representation_id, + 'local', + self.item._id) + self.table_view.model().refresh( + load_records=self.table_view.model()._rec_loaded) + + def _reset_remote_site(self): + """ + Removes errors or success metadata for particular file >> forces + redo of upload/download + """ + self.sync_server.reset_provider_for_file( + self.table_view.model().project, + self.representation_id, + 'remote', + self.item._id) + self.table_view.model().refresh( + load_records=self.table_view.model()._rec_loaded) + + def _open_in_explorer(self, site): + if not self.item: + return + + fpath = self.item.path + project = self.project + fpath = self.sync_server.get_local_file_path(project, site, fpath) + + fpath = os.path.normpath(os.path.dirname(fpath)) + if os.path.isdir(fpath): + if 'win' in sys.platform: # windows + subprocess.Popen('explorer "%s"' % fpath) + elif sys.platform == 'darwin': # macOS + subprocess.Popen(['open', fpath]) + else: # linux + try: + subprocess.Popen(['xdg-open', fpath]) + except OSError: + raise OSError('unsupported xdg-open call??') + + def _save_scrollbar(self): + self._scrollbar_pos = self.table_view.verticalScrollBar().value() + + def _set_scrollbar(self): + if self._scrollbar_pos: + self.table_view.verticalScrollBar().setValue(self._scrollbar_pos) + + +class SyncRepresentationErrorWidget(QtWidgets.QWidget): + """ + Dialog to show when sync error happened, prints error message + """ + + def __init__(self, _id, dt, tries, msg, parent=None): + super(SyncRepresentationErrorWidget, self).__init__(parent) + + layout = QtWidgets.QHBoxLayout(self) + + txts = [] + txts.append("{}: {}".format("Last update date", pretty_timestamp(dt))) + txts.append("{}: {}".format("Retries", str(tries))) + txts.append("{}: {}".format("Error message", msg)) + + text_area = QtWidgets.QPlainTextEdit("\n\n".join(txts)) + text_area.setReadOnly(True) + layout.addWidget(text_area) + + +class ImageDelegate(QtWidgets.QStyledItemDelegate): + """ + Prints icon of site and progress of synchronization + """ + + def __init__(self, parent=None): + super(ImageDelegate, self).__init__(parent) + self.icons = {} + + def paint(self, painter, option, index): + super(ImageDelegate, self).paint(painter, option, index) + option = QtWidgets.QStyleOptionViewItem(option) + option.showDecorationSelected = True + + provider = index.data(lib.ProviderRole) + value = index.data(lib.ProgressRole) + date_value = index.data(lib.DateRole) + is_failed = index.data(lib.FailedRole) + + if not self.icons.get(provider): + resource_path = os.path.dirname(__file__) + resource_path = os.path.join(resource_path, "..", + "providers", "resources") + pix_url = "{}/{}.png".format(resource_path, provider) + pixmap = QtGui.QPixmap(pix_url) + self.icons[provider] = pixmap + else: + pixmap = self.icons[provider] + + padding = 10 + point = QtCore.QPoint(option.rect.x() + padding, + option.rect.y() + + (option.rect.height() - pixmap.height()) / 2) + painter.drawPixmap(point, pixmap) + + overlay_rect = option.rect.translated(0, 0) + overlay_rect.setHeight(overlay_rect.height() * (1.0 - float(value))) + painter.fillRect(overlay_rect, + QtGui.QBrush(QtGui.QColor(0, 0, 0, 100))) + text_rect = option.rect.translated(10, 0) + painter.drawText(text_rect, + QtCore.Qt.AlignCenter, + date_value) + + if is_failed: + overlay_rect = option.rect.translated(0, 0) + painter.fillRect(overlay_rect, + QtGui.QBrush(QtGui.QColor(255, 0, 0, 35))) + + +class SyncServerDetailWindow(QtWidgets.QDialog): + def __init__(self, sync_server, _id, project, parent=None): + log.debug( + "!!! SyncServerDetailWindow _id:: {}".format(_id)) + super(SyncServerDetailWindow, self).__init__(parent) + self.setWindowFlags(QtCore.Qt.Window) + self.setFocusPolicy(QtCore.Qt.StrongFocus) + + self.setStyleSheet(style.load_stylesheet()) + self.setWindowIcon(QtGui.QIcon(style.app_icon_path())) + self.resize(1000, 400) + + body = QtWidgets.QWidget() + footer = QtWidgets.QWidget() + footer.setFixedHeight(20) + + container = SyncRepresentationDetailWidget(sync_server, _id, project, + parent=self) + body_layout = QtWidgets.QHBoxLayout(body) + body_layout.addWidget(container) + body_layout.setContentsMargins(0, 0, 0, 0) + + self.message = QtWidgets.QLabel() + self.message.hide() + + footer_layout = QtWidgets.QVBoxLayout(footer) + footer_layout.addWidget(self.message) + footer_layout.setContentsMargins(0, 0, 0, 0) + + layout = QtWidgets.QVBoxLayout(self) + layout.addWidget(body) + layout.addWidget(footer) + + self.setLayout(body_layout) + self.setWindowTitle("Sync Representation Detail") + + +class SyncRepresentationErrorWindow(QtWidgets.QDialog): + def __init__(self, _id, project, dt, tries, msg, parent=None): + super(SyncRepresentationErrorWindow, self).__init__(parent) + self.setWindowFlags(QtCore.Qt.Window) + self.setFocusPolicy(QtCore.Qt.StrongFocus) + + self.setStyleSheet(style.load_stylesheet()) + self.setWindowIcon(QtGui.QIcon(style.app_icon_path())) + self.resize(900, 150) + + body = QtWidgets.QWidget() + + container = SyncRepresentationErrorWidget(_id, dt, tries, msg, + parent=self) + body_layout = QtWidgets.QHBoxLayout(body) + body_layout.addWidget(container) + body_layout.setContentsMargins(0, 0, 0, 0) + + message = QtWidgets.QLabel() + message.hide() + + layout = QtWidgets.QVBoxLayout(self) + layout.addWidget(body) + + self.setLayout(body_layout) + self.setWindowTitle("Sync Representation Error Detail") diff --git a/openpype/modules/sync_server/utils.py b/openpype/modules/sync_server/utils.py index 0762766783..36f3444399 100644 --- a/openpype/modules/sync_server/utils.py +++ b/openpype/modules/sync_server/utils.py @@ -1,8 +1,14 @@ import time -from openpype.api import Logger +from openpype.api import Logger log = Logger().get_logger("SyncServer") +class SyncStatus: + DO_NOTHING = 0 + DO_UPLOAD = 1 + DO_DOWNLOAD = 2 + + def time_function(method): """ Decorator to print how much time function took. For debugging. diff --git a/openpype/modules/timers_manager/timers_manager.py b/openpype/modules/timers_manager/timers_manager.py index a8ea5799e6..92edd5aeaa 100644 --- a/openpype/modules/timers_manager/timers_manager.py +++ b/openpype/modules/timers_manager/timers_manager.py @@ -45,11 +45,13 @@ class TimersManager(PypeModule, ITrayService, IIdleManager, IWebServerRoutes): timers_settings = modules_settings[self.name] self.enabled = timers_settings["enabled"] + auto_stop = timers_settings["auto_stop"] # When timer will stop if idle manager is running (minutes) full_time = int(timers_settings["full_time"] * 60) # How many minutes before the timer is stopped will popup the message message_time = int(timers_settings["message_time"] * 60) + self.auto_stop = auto_stop self.time_show_message = full_time - message_time self.time_stop_timer = full_time @@ -160,6 +162,9 @@ class TimersManager(PypeModule, ITrayService, IIdleManager, IWebServerRoutes): def callbacks_by_idle_time(self): """Implementation of IIdleManager interface.""" # Time when message is shown + if not self.auto_stop: + return {} + callbacks = collections.defaultdict(list) callbacks[self.time_show_message].append(lambda: self.time_callback(0)) diff --git a/openpype/plugins/load/add_site.py b/openpype/plugins/load/add_site.py new file mode 100644 index 0000000000..09448d553c --- /dev/null +++ b/openpype/plugins/load/add_site.py @@ -0,0 +1,33 @@ +from avalon import api +from openpype.modules import ModulesManager + + +class AddSyncSite(api.Loader): + """Add sync site to representation""" + representations = ["*"] + families = ["*"] + + label = "Add Sync Site" + order = 2 # lower means better + icon = "download" + color = "#999999" + + def load(self, context, name=None, namespace=None, data=None): + self.log.info("Adding {} to representation: {}".format( + data["site_name"], data["_id"])) + self.add_site_to_representation(data["project_name"], + data["_id"], + data["site_name"]) + self.log.debug("Site added.") + + @staticmethod + def add_site_to_representation(project_name, representation_id, site_name): + """Adds new site to representation_id, resets if exists""" + manager = ModulesManager() + sync_server = manager.modules_by_name["sync_server"] + sync_server.add_site(project_name, representation_id, site_name, + force=True) + + def filepath_from_context(self, context): + """No real file loading""" + return "" diff --git a/openpype/plugins/load/delete_old_versions.py b/openpype/plugins/load/delete_old_versions.py index e5132e0f8a..8e3999e9c4 100644 --- a/openpype/plugins/load/delete_old_versions.py +++ b/openpype/plugins/load/delete_old_versions.py @@ -15,11 +15,12 @@ from openpype.api import Anatomy class DeleteOldVersions(api.Loader): - + """Deletes specific number of old version""" representations = ["*"] families = ["*"] label = "Delete Old Versions" + order = 35 icon = "trash" color = "#d8d8d8" @@ -421,8 +422,9 @@ class DeleteOldVersions(api.Loader): class CalculateOldVersions(DeleteOldVersions): - + """Calculate file size of old versions""" label = "Calculate Old Versions" + order = 30 options = [ qargparse.Integer( diff --git a/openpype/plugins/load/remove_site.py b/openpype/plugins/load/remove_site.py new file mode 100644 index 0000000000..aedb5d1f2f --- /dev/null +++ b/openpype/plugins/load/remove_site.py @@ -0,0 +1,33 @@ +from avalon import api +from openpype.modules import ModulesManager + + +class RemoveSyncSite(api.Loader): + """Remove sync site and its files on representation""" + representations = ["*"] + families = ["*"] + + label = "Remove Sync Site" + order = 4 + icon = "download" + color = "#999999" + + def load(self, context, name=None, namespace=None, data=None): + self.log.info("Removing {} on representation: {}".format( + data["site_name"], data["_id"])) + self.remove_site_on_representation(data["project_name"], + data["_id"], + data["site_name"]) + self.log.debug("Site added.") + + @staticmethod + def remove_site_on_representation(project_name, representation_id, + site_name): + manager = ModulesManager() + sync_server = manager.modules_by_name["sync_server"] + sync_server.remove_site(project_name, representation_id, + site_name, True) + + def filepath_from_context(self, context): + """No real file loading""" + return "" diff --git a/openpype/plugins/publish/collect_hierarchy.py b/openpype/plugins/publish/collect_hierarchy.py index 5c5dbf018c..390ce443b6 100644 --- a/openpype/plugins/publish/collect_hierarchy.py +++ b/openpype/plugins/publish/collect_hierarchy.py @@ -40,7 +40,7 @@ class CollectHierarchy(pyblish.api.ContextPlugin): continue # exclude if not masterLayer True - if not instance.data.get("masterLayer"): + if not instance.data.get("heroTrack"): continue # get asset build data if any available @@ -50,7 +50,7 @@ class CollectHierarchy(pyblish.api.ContextPlugin): # suppose that all instances are Shots shot_data['entity_type'] = 'Shot' - shot_data['tasks'] = instance.data.get("tasks") or [] + shot_data['tasks'] = instance.data.get("tasks") or {} shot_data["comments"] = instance.data.get("comments", []) shot_data['custom_attributes'] = { diff --git a/openpype/plugins/publish/integrate_new.py b/openpype/plugins/publish/integrate_new.py index 0d36828ccf..ea90f284b2 100644 --- a/openpype/plugins/publish/integrate_new.py +++ b/openpype/plugins/publish/integrate_new.py @@ -976,6 +976,9 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin): local_site = local_site_id remote_site = sync_server_presets["config"].get("remote_site") + if remote_site == local_site: + remote_site = None + if remote_site == 'local': remote_site = local_site_id diff --git a/openpype/scripts/export_maya_ass_job.py b/openpype/scripts/export_maya_ass_job.py index 6e5eff6663..16e841ce96 100644 --- a/openpype/scripts/export_maya_ass_job.py +++ b/openpype/scripts/export_maya_ass_job.py @@ -54,11 +54,11 @@ def __main__(): print("Got Pype location from environment: {}".format( os.environ.get('OPENPYPE_SETUP_PATH'))) - pype_command = "pype.ps1" + pype_command = "openpype.ps1" if platform.system().lower() == "linux": pype_command = "pype" elif platform.system().lower() == "windows": - pype_command = "pype.bat" + pype_command = "openpype.bat" if kwargs.pype: pype_root = kwargs.pype diff --git a/openpype/settings/defaults/project_anatomy/attributes.json b/openpype/settings/defaults/project_anatomy/attributes.json index 987021f25b..3ad6761331 100644 --- a/openpype/settings/defaults/project_anatomy/attributes.json +++ b/openpype/settings/defaults/project_anatomy/attributes.json @@ -10,17 +10,17 @@ "resolutionHeight": 1080, "pixelAspect": 1.0, "applications": [ - "maya_2020", - "nuke_12-2", - "nukex_12-2", - "hiero_12-2", - "resolve_16", - "houdini_18-5", - "blender_2-90", - "harmony_20", - "photoshop_2021", - "aftereffects_2021", - "unreal_4-24" + "maya/2020", + "nuke/12-2", + "nukex/12-2", + "hiero/12-2", + "resolve/16", + "houdini/18-5", + "blender/2-91", + "harmony/20", + "photoshop/2021", + "aftereffects/2021", + "unreal/4-24" ], "tools_env": [] } \ No newline at end of file diff --git a/openpype/settings/defaults/project_settings/ftrack.json b/openpype/settings/defaults/project_settings/ftrack.json index 03ac8f309f..8970aa8ac8 100644 --- a/openpype/settings/defaults/project_settings/ftrack.json +++ b/openpype/settings/defaults/project_settings/ftrack.json @@ -7,6 +7,14 @@ "not ready" ] }, + "prepare_project": { + "enabled": true, + "role_list": [ + "Pypeclub", + "Administrator", + "Project manager" + ] + }, "sync_hier_entity_attributes": { "enabled": true, "interest_entity_types": [ @@ -195,7 +203,7 @@ "publish": { "IntegrateFtrackNote": { "enabled": true, - "note_with_intent_template": "", + "note_with_intent_template": "{intent}: {comment}", "note_labels": [] }, "ValidateFtrackAttributes": { diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json index 8081f92ef7..ca1b258e72 100644 --- a/openpype/settings/defaults/project_settings/global.json +++ b/openpype/settings/defaults/project_settings/global.json @@ -6,7 +6,9 @@ "ExtractJpegEXR": { "enabled": true, "ffmpeg_args": { - "input": [], + "input": [ + "-gamma 2.2" + ], "output": [] } }, diff --git a/openpype/settings/defaults/project_settings/harmony.json b/openpype/settings/defaults/project_settings/harmony.json index e1de4485a4..f5f084dd44 100644 --- a/openpype/settings/defaults/project_settings/harmony.json +++ b/openpype/settings/defaults/project_settings/harmony.json @@ -14,7 +14,7 @@ "priority": 50, "primary_pool": "", "secondary_pool": "", - "chunk_size": 0 + "chunk_size": 1000000 } } } \ No newline at end of file diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index feddd2860a..dfece74f80 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -8,6 +8,13 @@ "yetiRig": "ma" }, "create": { + "CreateLook": { + "enabled": true, + "make_tx": true, + "defaults": [ + "Main" + ] + }, "CreateAnimation": { "enabled": true, "defaults": [ @@ -38,12 +45,6 @@ "Main" ] }, - "CreateLook": { - "enabled": true, - "defaults": [ - "Main" - ] - }, "CreateMayaScene": { "enabled": true, "defaults": [ @@ -313,8 +314,8 @@ "rendererName": "vp2Renderer" }, "Resolution": { - "width": 1080, - "height": 1920, + "width": 1920, + "height": 1080, "percent": 1.0, "mode": "Custom" }, diff --git a/openpype/settings/defaults/project_settings/nuke.json b/openpype/settings/defaults/project_settings/nuke.json index 0173eb0a82..852e041805 100644 --- a/openpype/settings/defaults/project_settings/nuke.json +++ b/openpype/settings/defaults/project_settings/nuke.json @@ -6,7 +6,9 @@ "load": "ctrl+alt+l", "manage": "ctrl+alt+m", "build_workfile": "ctrl+alt+b" - } + }, + "open_workfile_at_start": false, + "create_initial_workfile": true }, "create": { "CreateWriteRender": { diff --git a/openpype/settings/defaults/project_settings/standalonepublisher.json b/openpype/settings/defaults/project_settings/standalonepublisher.json index 08895bcba9..9d40d2ded6 100644 --- a/openpype/settings/defaults/project_settings/standalonepublisher.json +++ b/openpype/settings/defaults/project_settings/standalonepublisher.json @@ -116,7 +116,7 @@ "ExtractThumbnailSP": { "ffmpeg_args": { "input": [ - "gamma 2.2" + "-gamma 2.2" ], "output": [] } diff --git a/openpype/settings/defaults/project_settings/tvpaint.json b/openpype/settings/defaults/project_settings/tvpaint.json new file mode 100644 index 0000000000..a6c10b3809 --- /dev/null +++ b/openpype/settings/defaults/project_settings/tvpaint.json @@ -0,0 +1,15 @@ +{ + "publish": { + "ValidateProjectSettings": { + "enabled": true, + "optional": true, + "active": true + }, + "ValidateMarks": { + "enabled": true, + "optional": true, + "active": true + } + }, + "filters": {} +} \ No newline at end of file diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json index e7c505f184..58a9818465 100644 --- a/openpype/settings/defaults/system_settings/applications.json +++ b/openpype/settings/defaults/system_settings/applications.json @@ -6,9 +6,9 @@ "host_name": "maya", "environment": { "PYTHONPATH": [ - "{OPENPYPE_ROOT}/pype/hosts/maya/startup", - "{OPENPYPE_ROOT}/repos/avalon-core/setup/maya", - "{OPENPYPE_ROOT}/repos/maya-look-assigner", + "{OPENPYPE_REPOS_ROOT}/openpype/hosts/maya/startup", + "{OPENPYPE_REPOS_ROOT}/repos/avalon-core/setup/maya", + "{OPENPYPE_REPOS_ROOT}/repos/maya-look-assigner", "{PYTHONPATH}" ], "MAYA_DISABLE_CLIC_IPM": "Yes", @@ -19,9 +19,26 @@ "OPENPYPE_LOG_NO_COLORS": "Yes" }, "variants": { - "maya_2020": { - "enabled": true, - "variant_label": "2020", + "2022": { + "executables": { + "windows": [ + "C:\\Program Files\\Autodesk\\Maya2022\\bin\\maya.exe" + ], + "darwin": [], + "linux": [ + "/usr/autodesk/maya2022/bin/maya" + ] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": { + "MAYA_VERSION": "2022" + } + }, + "2020": { "executables": { "windows": [ "C:\\Program Files\\Autodesk\\Maya2020\\bin\\maya.exe" @@ -40,9 +57,7 @@ "MAYA_VERSION": "2020" } }, - "maya_2019": { - "enabled": true, - "variant_label": "2019", + "2019": { "executables": { "windows": [ "C:\\Program Files\\Autodesk\\Maya2019\\bin\\maya.exe" @@ -61,9 +76,7 @@ "MAYA_VERSION": "2019" } }, - "maya_2018": { - "enabled": true, - "variant_label": "2018", + "2018": { "executables": { "windows": [ "C:\\Program Files\\Autodesk\\Maya2018\\bin\\maya.exe" @@ -81,86 +94,9 @@ "environment": { "MAYA_VERSION": "2018" } - } - } - }, - "mayabatch": { - "enabled": true, - "label": "MayaBatch", - "icon": "{}/app_icons/maya.png", - "host_name": "maya", - "environment": { - "PYTHONPATH": [ - "{OPENPYPE_ROOT}/avalon-core/setup/maya", - "{OPENPYPE_ROOT}/maya-look-assigner", - "{PYTHON_ENV}/python2/Lib/site-packages", - "{PYTHONPATH}" - ], - "MAYA_DISABLE_CLIC_IPM": "Yes", - "MAYA_DISABLE_CIP": "Yes", - "MAYA_DISABLE_CER": "Yes", - "PYMEL_SKIP_MEL_INIT": "Yes", - "LC_ALL": "C", - "OPENPYPE_LOG_NO_COLORS": "Yes", - "MAYA_TEST": "{MAYA_VERSION}" - }, - "variants": { - "mayabatch_2020": { - "enabled": true, - "variant_label": "2020", - "executables": { - "windows": [ - "C:\\Program Files\\Autodesk\\Maya2020\\bin\\mayabatch.exe" - ], - "darwin": [], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": { - "MAYA_VERSION": "2020" - } }, - "mayabatch_2019": { - "enabled": true, - "variant_label": "2019", - "executables": { - "windows": [ - "C:\\Program Files\\Autodesk\\Maya2019\\bin\\mayabatch.exe" - ], - "darwin": [], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": { - "MAYA_VERSION": "2019" - } - }, - "mayabatch_2018": { - "enabled": true, - "variant_label": "2018", - "executables": { - "windows": [ - "C:\\Program Files\\Autodesk\\Maya2018\\bin\\mayabatch.exe" - ], - "darwin": [], - "linux": [] - }, - "arguments": { - "windows": [], - "darwin": [], - "linux": [] - }, - "environment": { - "MAYA_VERSION": "2018" - } + "__dynamic_keys_labels__": { + "2022": "2022 (Testing Only)" } } }, @@ -171,8 +107,8 @@ "host_name": "nuke", "environment": { "NUKE_PATH": [ - "{OPENPYPE_ROOT}/repos/avalon-core/setup/nuke/nuke_path", - "{OPENPYPE_ROOT}/openpype/hosts/nuke/startup", + "{OPENPYPE_REPOS_ROOT}/repos/avalon-core/setup/nuke/nuke_path", + "{OPENPYPE_REPOS_ROOT}/openpype/hosts/nuke/startup", "{OPENPYPE_STUDIO_PLUGINS}/nuke" ], "PATH": { @@ -181,9 +117,24 @@ "LOGLEVEL": "DEBUG" }, "variants": { - "nuke_12-2": { - "enabled": true, - "variant_label": "12.2", + "13-0": { + "executables": { + "windows": [ + "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke13.0v1/Nuke13.0" + ] + }, + "arguments": { + "windows": [], + "darwin": [], + "linux": [] + }, + "environment": {} + }, + "12-2": { "executables": { "windows": [ "C:\\Program Files\\Nuke12.2v3\\Nuke12.2.exe" @@ -200,9 +151,7 @@ }, "environment": {} }, - "nuke_12-0": { - "enabled": true, - "variant_label": "12.0", + "12-0": { "executables": { "windows": [ "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe" @@ -219,9 +168,7 @@ }, "environment": {} }, - "nuke_11-3": { - "enabled": true, - "variant_label": "11.3", + "11-3": { "executables": { "windows": [ "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe" @@ -238,9 +185,7 @@ }, "environment": {} }, - "nuke_11-2": { - "enabled": true, - "variant_label": "11.2", + "11-2": { "executables": { "windows": [ "C:\\Program Files\\Nuke11.2v2\\Nuke11.2.exe" @@ -254,6 +199,13 @@ "linux": [] }, "environment": {} + }, + "__dynamic_keys_labels__": { + "12-2": "12.2", + "12-0": "12.0", + "11-3": "11.3", + "11-2": "11.2", + "13-0": "13.0 (Testing only)" } } }, @@ -264,8 +216,8 @@ "host_name": "nuke", "environment": { "NUKE_PATH": [ - "{OPENPYPE_ROOT}/repos/avalon-core/setup/nuke/nuke_path", - "{OPENPYPE_ROOT}/openpype/hosts/nuke/startup", + "{OPENPYPE_REPOS_ROOT}/repos/avalon-core/setup/nuke/nuke_path", + "{OPENPYPE_REPOS_ROOT}/openpype/hosts/nuke/startup", "{OPENPYPE_STUDIO_PLUGINS}/nuke" ], "PATH": { @@ -274,9 +226,30 @@ "LOGLEVEL": "DEBUG" }, "variants": { - "nukex_12-2": { - "enabled": true, - "variant_label": "12.2", + "13-0": { + "executables": { + "windows": [ + "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke13.0v1/Nuke13.0" + ] + }, + "arguments": { + "windows": [ + "--nukex" + ], + "darwin": [ + "--nukex" + ], + "linux": [ + "--nukex" + ] + }, + "environment": {} + }, + "12-2": { "executables": { "windows": [ "C:\\Program Files\\Nuke12.2v3\\Nuke12.2.exe" @@ -299,9 +272,7 @@ }, "environment": {} }, - "nukex_12-0": { - "enabled": true, - "variant_label": "12.0", + "12-0": { "executables": { "windows": [ "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe" @@ -324,9 +295,7 @@ }, "environment": {} }, - "nukex_11-3": { - "enabled": true, - "variant_label": "11.3", + "11-3": { "executables": { "windows": [ "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe" @@ -349,9 +318,7 @@ }, "environment": {} }, - "nukex_11-2": { - "enabled": true, - "variant_label": "11.2", + "11-2": { "executables": { "windows": [ "C:\\Program Files\\Nuke11.2v2\\Nuke11.2.exe" @@ -371,6 +338,13 @@ ] }, "environment": {} + }, + "__dynamic_keys_labels__": { + "12-2": "12.2", + "12-0": "12.0", + "11-3": "11.3", + "11-2": "11.2", + "13-0": "13.0 (Testing only)" } } }, @@ -381,7 +355,7 @@ "host_name": "hiero", "environment": { "HIERO_PLUGIN_PATH": [ - "{OPENPYPE_ROOT}/openpype/hosts/hiero/startup" + "{OPENPYPE_REPOS_ROOT}/openpype/hosts/hiero/startup" ], "PATH": { "windows": "C:/Program Files (x86)/QuickTime/QTSystem/;{PATH}" @@ -391,9 +365,30 @@ "LOGLEVEL": "DEBUG" }, "variants": { - "nukestudio_12-2": { - "enabled": true, - "variant_label": "12.2", + "13-0": { + "executables": { + "windows": [ + "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke13.0v1/Nuke13.0" + ] + }, + "arguments": { + "windows": [ + "--studio" + ], + "darwin": [ + "--studio" + ], + "linux": [ + "--studio" + ] + }, + "environment": {} + }, + "12-2": { "executables": { "windows": [ "C:\\Program Files\\Nuke12.2v3\\Nuke12.2.exe" @@ -416,9 +411,7 @@ }, "environment": {} }, - "nukestudio_12-0": { - "enabled": true, - "variant_label": "12.0", + "12-0": { "executables": { "windows": [ "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe" @@ -441,9 +434,7 @@ }, "environment": {} }, - "nukestudio_11-3": { - "enabled": true, - "variant_label": "11.3", + "11-3": { "executables": { "windows": [ "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe" @@ -466,9 +457,7 @@ }, "environment": {} }, - "nukestudio_11-2": { - "enabled": true, - "variant_label": "11.2", + "11-2": { "executables": { "windows": [], "darwin": [], @@ -486,6 +475,13 @@ ] }, "environment": {} + }, + "__dynamic_keys_labels__": { + "12-2": "12.2", + "12-0": "12.0", + "11-3": "11.3", + "11-2": "11.2", + "13-0": "13.0 (Testing only)" } } }, @@ -496,7 +492,7 @@ "host_name": "hiero", "environment": { "HIERO_PLUGIN_PATH": [ - "{OPENPYPE_ROOT}/openpype/hosts/hiero/startup" + "{OPENPYPE_REPOS_ROOT}/openpype/hosts/hiero/startup" ], "PATH": { "windows": "C:/Program Files (x86)/QuickTime/QTSystem/;{PATH}" @@ -506,9 +502,30 @@ "LOGLEVEL": "DEBUG" }, "variants": { - "hiero_12-2": { - "enabled": true, - "variant_label": "12.2", + "13-0": { + "executables": { + "windows": [ + "C:\\Program Files\\Nuke13.0v1\\Nuke13.0.exe" + ], + "darwin": [], + "linux": [ + "/usr/local/Nuke13.0v1/Nuke13.0" + ] + }, + "arguments": { + "windows": [ + "--hiero" + ], + "darwin": [ + "--hiero" + ], + "linux": [ + "--hiero" + ] + }, + "environment": {} + }, + "12-2": { "executables": { "windows": [ "C:\\Program Files\\Nuke12.2v3\\Nuke12.2.exe" @@ -531,9 +548,7 @@ }, "environment": {} }, - "hiero_12-0": { - "enabled": true, - "variant_label": "12.0", + "12-0": { "executables": { "windows": [ "C:\\Program Files\\Nuke12.0v1\\Nuke12.0.exe" @@ -556,9 +571,7 @@ }, "environment": {} }, - "hiero_11-3": { - "enabled": true, - "variant_label": "11.3", + "11-3": { "executables": { "windows": [ "C:\\Program Files\\Nuke11.3v1\\Nuke11.3.exe" @@ -581,9 +594,7 @@ }, "environment": {} }, - "hiero_11-2": { - "enabled": true, - "variant_label": "11.2", + "11-2": { "executables": { "windows": [ "C:\\Program Files\\Nuke11.2v2\\Nuke11.2.exe" @@ -603,6 +614,13 @@ ] }, "environment": {} + }, + "__dynamic_keys_labels__": { + "12-2": "12.2", + "12-0": "12.0", + "11-3": "11.3", + "11-2": "11.2", + "13-0": "13.0 (Testing only)" } } }, @@ -636,7 +654,7 @@ "OPENPYPE_LOG_NO_COLORS": "Yes" }, "variants": { - "fusion_16": { + "16": { "enabled": true, "variant_label": "16", "executables": { @@ -651,7 +669,7 @@ }, "environment": {} }, - "fusion_9": { + "9": { "enabled": true, "variant_label": "9", "executables": { @@ -709,12 +727,12 @@ "{PYTHON36_RESOLVE}/Scripts", "{PATH}" ], - "PRE_PYTHON_SCRIPT": "{OPENPYPE_ROOT}/openpype/resolve/preload_console.py", + "PRE_PYTHON_SCRIPT": "{OPENPYPE_REPOS_ROOT}/openpype/resolve/preload_console.py", "OPENPYPE_LOG_NO_COLORS": "True", "RESOLVE_DEV": "True" }, "variants": { - "resolve_16": { + "16": { "enabled": true, "variant_label": "16", "executables": { @@ -740,20 +758,18 @@ "host_name": "houdini", "environment": { "HOUDINI_PATH": { - "darwin": "{OPENPYPE_ROOT}/openpype/hosts/houdini/startup:&", - "linux": "{OPENPYPE_ROOT}/openpype/hosts/houdini/startup:&", - "windows": "{OPENPYPE_ROOT}/openpype/hosts/houdini/startup;&" + "darwin": "{OPENPYPE_REPOS_ROOT}/openpype/hosts/houdini/startup:&", + "linux": "{OPENPYPE_REPOS_ROOT}/openpype/hosts/houdini/startup:&", + "windows": "{OPENPYPE_REPOS_ROOT}/openpype/hosts/houdini/startup;&" }, "HOUDINI_MENU_PATH": { - "darwin": "{OPENPYPE_ROOT}/openpype/hosts/houdini/startup:&", - "linux": "{OPENPYPE_ROOT}/openpype/hosts/houdini/startup:&", - "windows": "{OPENPYPE_ROOT}/openpype/hosts/houdini/startup;&" + "darwin": "{OPENPYPE_REPOS_ROOT}/openpype/hosts/houdini/startup:&", + "linux": "{OPENPYPE_REPOS_ROOT}/openpype/hosts/houdini/startup:&", + "windows": "{OPENPYPE_REPOS_ROOT}/openpype/hosts/houdini/startup;&" } }, "variants": { - "houdini_18-5": { - "enabled": true, - "variant_label": "18.5", + "18-5": { "executables": { "windows": [ "C:\\Program Files\\Side Effects Software\\Houdini 18.5.499\\bin\\houdini.exe" @@ -768,9 +784,7 @@ }, "environment": {} }, - "houdini_18": { - "enabled": true, - "variant_label": "18", + "18": { "executables": { "windows": [], "darwin": [], @@ -783,9 +797,7 @@ }, "environment": {} }, - "houdini_17": { - "enabled": true, - "variant_label": "17", + "17": { "executables": { "windows": [], "darwin": [], @@ -797,6 +809,11 @@ "linux": [] }, "environment": {} + }, + "__dynamic_keys_labels__": { + "18-5": "18.5", + "18": "18", + "17": "17" } } }, @@ -806,17 +823,15 @@ "icon": "{}/app_icons/blender.png", "host_name": "blender", "environment": { - "BLENDER_USER_SCRIPTS": "{OPENPYPE_ROOT}/repos/avalon-core/setup/blender", + "BLENDER_USER_SCRIPTS": "{OPENPYPE_REPOS_ROOT}/repos/avalon-core/setup/blender", "PYTHONPATH": [ - "{OPENPYPE_ROOT}/repos/avalon-core/setup/blender", + "{OPENPYPE_REPOS_ROOT}/repos/avalon-core/setup/blender", "{PYTHONPATH}" ], - "CREATE_NEW_CONSOLE": "yes" + "QT_PREFERRED_BINDING": "PySide2" }, "variants": { - "blender_2-83": { - "enabled": true, - "variant_label": "2.83", + "2-83": { "executables": { "windows": [ "C:\\Program Files\\Blender Foundation\\Blender 2.83\\blender.exe" @@ -837,9 +852,7 @@ }, "environment": {} }, - "blender_2-90": { - "enabled": true, - "variant_label": "2.90", + "2-90": { "executables": { "windows": [ "C:\\Program Files\\Blender Foundation\\Blender 2.90\\blender.exe" @@ -859,6 +872,32 @@ ] }, "environment": {} + }, + "2-91": { + "executables": { + "windows": [ + "C:\\Program Files\\Blender Foundation\\Blender 2.91\\blender.exe" + ], + "darwin": [], + "linux": [] + }, + "arguments": { + "windows": [ + "--python-use-system-env" + ], + "darwin": [ + "--python-use-system-env" + ], + "linux": [ + "--python-use-system-env" + ] + }, + "environment": {} + }, + "__dynamic_keys_labels__": { + "2-83": "2.83", + "2-90": "2.90", + "2-91": "2.91" } } }, @@ -869,10 +908,10 @@ "host_name": "harmony", "environment": { "AVALON_HARMONY_WORKFILES_ON_LAUNCH": "1", - "LIB_OPENHARMONY_PATH": "{OPENPYPE_ROOT}/pype/vendor/OpenHarmony" + "LIB_OPENHARMONY_PATH": "{OPENPYPE_REPOS_ROOT}/pype/vendor/OpenHarmony" }, "variants": { - "harmony_20": { + "20": { "enabled": true, "variant_label": "20", "executables": { @@ -887,7 +926,7 @@ }, "environment": {} }, - "harmony_17": { + "17": { "enabled": true, "variant_label": "17", "executables": { @@ -915,9 +954,7 @@ "OPENPYPE_LOG_NO_COLORS": "True" }, "variants": { - "tvpaint_animation_11-64bits": { - "enabled": true, - "variant_label": "11 (64bits)", + "animation_11-64bits": { "executables": { "windows": [ "C:\\Program Files\\TVPaint Developpement\\TVPaint Animation 11 (64bits)\\TVPaint Animation 11 (64bits).exe" @@ -932,9 +969,7 @@ }, "environment": {} }, - "tvpaint_animation_11-32bits": { - "enabled": true, - "variant_label": "11 (32bits)", + "animation_11-32bits": { "executables": { "windows": [ "C:\\Program Files (x86)\\TVPaint Developpement\\TVPaint Animation 11 (32bits)\\TVPaint Animation 11 (32bits).exe" @@ -948,6 +983,10 @@ "linux": [] }, "environment": {} + }, + "__dynamic_keys_labels__": { + "animation_11-64bits": "11 (64bits)", + "animation_11-32bits": "11 (32bits)" } } }, @@ -963,7 +1002,7 @@ "WORKFILES_SAVE_AS": "Yes" }, "variants": { - "photoshop_2020": { + "2020": { "enabled": true, "variant_label": "2020", "executables": { @@ -980,7 +1019,7 @@ }, "environment": {} }, - "photoshop_2021": { + "2021": { "enabled": true, "variant_label": "2021", "executables": { @@ -1011,7 +1050,7 @@ "WORKFILES_SAVE_AS": "Yes" }, "variants": { - "aftereffects_2020": { + "2020": { "enabled": true, "variant_label": "2020", "executables": { @@ -1028,7 +1067,7 @@ }, "environment": {} }, - "aftereffects_2021": { + "2021": { "enabled": true, "variant_label": "2021", "executables": { @@ -1053,13 +1092,17 @@ "icon": "app_icons/celaction.png", "host_name": "celaction", "environment": { - "CELACTION_TEMPLATE": "{OPENPYPE_ROOT}/openpype/hosts/celaction/celaction_template_scene.scn" + "CELACTION_TEMPLATE": "{OPENPYPE_REPOS_ROOT}/openpype/hosts/celaction/celaction_template_scene.scn" }, "variants": { - "celation_Local": { + "local": { "enabled": true, "variant_label": "Local", - "executables": "", + "executables": { + "windows": [], + "darwin": [], + "linux": [] + }, "arguments": { "windows": [], "darwin": [], @@ -1075,14 +1118,12 @@ "icon": "{}/app_icons/ue4.png'", "host_name": "unreal", "environment": { - "AVALON_UNREAL_PLUGIN": "{OPENPYPE_ROOT}/repos/avalon-unreal-integration", + "AVALON_UNREAL_PLUGIN": "{OPENPYPE_REPOS_ROOT}/repos/avalon-unreal-integration", "OPENPYPE_LOG_NO_COLORS": "True", "QT_PREFERRED_BINDING": "PySide" }, "variants": { - "unreal_4-24": { - "enabled": true, - "variant_label": "4.24", + "4-24": { "executables": { "windows": [], "darwin": [], @@ -1101,9 +1142,7 @@ "enabled": true, "environment": {}, "variants": { - "python_python_3-7": { - "enabled": true, - "variant_label": "3.7", + "python_3-7": { "executables": { "windows": [], "darwin": [], @@ -1116,9 +1155,7 @@ }, "environment": {} }, - "python_python_2-7": { - "enabled": true, - "variant_label": "2.7", + "python_2-7": { "executables": { "windows": [], "darwin": [], @@ -1131,9 +1168,7 @@ }, "environment": {} }, - "terminal_terminal": { - "enabled": true, - "variant_label": "", + "terminal": { "executables": { "windows": [], "darwin": [], @@ -1145,6 +1180,10 @@ "linux": [] }, "environment": {} + }, + "__dynamic_keys_labels__": { + "python_3-7": "Python 3.7", + "python_2-7": "Python 2.7" } } }, @@ -1155,9 +1194,7 @@ "host_name": "", "environment": {}, "variants": { - "djvview_1-1": { - "enabled": true, - "variant_label": "1.1", + "1-1": { "executables": { "windows": [], "darwin": [], @@ -1169,6 +1206,9 @@ "linux": [] }, "environment": {} + }, + "__dynamic_keys_labels__": { + "1-1": "1.1" } } } diff --git a/openpype/settings/defaults/system_settings/general.json b/openpype/settings/defaults/system_settings/general.json index d93d2a0c3a..aacbf99391 100644 --- a/openpype/settings/defaults/system_settings/general.json +++ b/openpype/settings/defaults/system_settings/general.json @@ -3,9 +3,9 @@ "studio_code": "stu", "environment": { "FFMPEG_PATH": { - "windows": "{OPENPYPE_ROOT}/vendor/bin/ffmpeg_exec/windows/bin", - "darwin": "{OPENPYPE_ROOT}/vendor/bin/ffmpeg_exec/darwin/bin", - "linux": ":{OPENPYPE_ROOT}/vendor/bin/ffmpeg_exec/linux" + "windows": "{OPENPYPE_REPOS_ROOT}/vendor/bin/ffmpeg_exec/windows/bin", + "darwin": "{OPENPYPE_REPOS_ROOT}/vendor/bin/ffmpeg_exec/darwin/bin", + "linux": ":{OPENPYPE_REPOS_ROOT}/vendor/bin/ffmpeg_exec/linux" }, "OPENPYPE_OCIO_CONFIG": "{STUDIO_SOFT}/OpenColorIO-Configs", "__environment_keys__": { diff --git a/openpype/settings/defaults/system_settings/modules.json b/openpype/settings/defaults/system_settings/modules.json index 00e98aa8de..b3065058a1 100644 --- a/openpype/settings/defaults/system_settings/modules.json +++ b/openpype/settings/defaults/system_settings/modules.json @@ -126,6 +126,7 @@ }, "timers_manager": { "enabled": true, + "auto_stop": true, "full_time": 15.0, "message_time": 0.5 }, @@ -165,8 +166,5 @@ }, "standalonepublish_tool": { "enabled": true - }, - "idle_manager": { - "enabled": true } } \ No newline at end of file diff --git a/openpype/settings/entities/dict_mutable_keys_entity.py b/openpype/settings/entities/dict_mutable_keys_entity.py index cbc80b6409..7ba44ed0df 100644 --- a/openpype/settings/entities/dict_mutable_keys_entity.py +++ b/openpype/settings/entities/dict_mutable_keys_entity.py @@ -226,7 +226,16 @@ class DictMutableKeysEntity(EndpointEntity): self.is_group = True def schema_validations(self): + # Allow to have not set label if keys are collapsible + # - this it to bypass label validation + used_temp_label = False + if self.is_group and not self.label and self.collapsible_key: + used_temp_label = True + self.label = "LABEL" + super(DictMutableKeysEntity, self).schema_validations() + if used_temp_label: + self.label = None if not self.schema_data.get("object_type"): reason = ( diff --git a/openpype/settings/entities/enum_entity.py b/openpype/settings/entities/enum_entity.py index e28fb7478f..693305cb1e 100644 --- a/openpype/settings/entities/enum_entity.py +++ b/openpype/settings/entities/enum_entity.py @@ -117,7 +117,8 @@ class AppsEnumEntity(BaseEnumEntity): valid_keys = set() enum_items = [] - for app_group in system_settings_entity["applications"].values(): + applications_entity = system_settings_entity["applications"] + for group_name, app_group in applications_entity.items(): enabled_entity = app_group.get("enabled") if enabled_entity and not enabled_entity.value: continue @@ -127,17 +128,29 @@ class AppsEnumEntity(BaseEnumEntity): continue group_label = app_group["label"].value - - for variant_name, variant_entity in app_group["variants"].items(): + variants_entity = app_group["variants"] + for variant_name, variant_entity in variants_entity.items(): enabled_entity = variant_entity.get("enabled") if enabled_entity and not enabled_entity.value: continue - variant_label = variant_entity["variant_label"].value + variant_label = None + if "variant_label" in variant_entity: + variant_label = variant_entity["variant_label"].value + elif hasattr(variants_entity, "get_key_label"): + variant_label = variants_entity.get_key_label(variant_name) - full_label = "{} {}".format(group_label, variant_label) - enum_items.append({variant_name: full_label}) - valid_keys.add(variant_name) + if not variant_label: + variant_label = variant_name + + if group_label: + full_label = "{} {}".format(group_label, variant_label) + else: + full_label = variant_label + + full_name = "/".join((group_name, variant_name)) + enum_items.append({full_name: full_label}) + valid_keys.add(full_name) return enum_items, valid_keys def set_override_state(self, *args, **kwargs): diff --git a/openpype/settings/entities/schemas/projects_schema/schema_main.json b/openpype/settings/entities/schemas/projects_schema/schema_main.json index 565500edd2..6bc158aa60 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_main.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_main.json @@ -82,6 +82,10 @@ "type": "schema", "name": "schema_project_harmony" }, + { + "type": "schema", + "name": "schema_project_tvpaint" + }, { "type": "schema", "name": "schema_project_celaction" diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json b/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json index eefc0e12b7..a801175031 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json @@ -36,6 +36,25 @@ } ] }, + { + "type": "dict", + "key": "prepare_project", + "label": "Prepare Project", + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "list", + "key": "role_list", + "label": "Roles", + "object_type": "text" + } + ] + }, { "type": "dict", "key": "sync_hier_entity_attributes", diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_nuke.json b/openpype/settings/entities/schemas/projects_schema/schema_project_nuke.json index 75ca5411a1..5022b75719 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_nuke.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_nuke.json @@ -43,6 +43,16 @@ "label": "Build Workfile" } ] + }, + { + "type": "boolean", + "key": "open_workfile_at_start", + "label": "Open Workfile window at start of a Nuke session" + }, + { + "type": "boolean", + "key": "create_initial_workfile", + "label": "Create initial workfile version if none available" } ] }, @@ -87,7 +97,7 @@ "name": "schema_nuke_publish", "template_data": [] }, - { + { "type": "schema", "name": "schema_nuke_load", "template_data": [] @@ -101,4 +111,4 @@ "name": "schema_publish_gui_filter" } ] -} +} \ No newline at end of file diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_syncserver.json b/openpype/settings/entities/schemas/projects_schema/schema_project_syncserver.json index fd728f3982..ea1b8fc9da 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_syncserver.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_syncserver.json @@ -1,7 +1,7 @@ { "type": "dict", "key": "sync_server", - "label": "Sync Server (currently unused)", + "label": "Site Sync (beta testing)", "collapsible": true, "checkbox_key": "enabled", "is_file": true, diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json new file mode 100644 index 0000000000..0a9e7139dd --- /dev/null +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_tvpaint.json @@ -0,0 +1,44 @@ +{ + "type": "dict", + "collapsible": true, + "key": "tvpaint", + "label": "TVPaint", + "is_file": true, + "children": [ + { + "type": "dict", + "collapsible": true, + "key": "publish", + "label": "Publish plugins", + "is_file": true, + "children": [ + { + "type": "schema_template", + "name": "template_publish_plugin", + "template_data": [ + { + "key": "ValidateProjectSettings", + "label": "ValidateProjectSettings", + "docstring": "Validate if FPS and Resolution match shot data" + } + ] + }, + { + "type": "schema_template", + "name": "template_publish_plugin", + "template_data": [ + { + "key": "ValidateMarks", + "label": "Validate MarkIn/Out", + "docstring": "Validate MarkIn/Out match Frame start/end on shot data" + } + ] + } + ] + }, + { + "type": "schema", + "name": "schema_publish_gui_filter" + } + ] +} diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json index 575e04c85d..d728f1def3 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_create.json @@ -4,6 +4,31 @@ "key": "create", "label": "Creator plugins", "children": [ + { + "type": "dict", + "collapsible": true, + "key": "CreateLook", + "label": "Create Look", + "checkbox_key": "enabled", + "children": [ + { + "type": "boolean", + "key": "enabled", + "label": "Enabled" + }, + { + "type": "boolean", + "key": "make_tx", + "label": "Make tx files" + }, + { + "type": "list", + "key": "defaults", + "label": "Default Subsets", + "object_type": "text" + } + ] + }, { "type": "schema_template", "name": "template_create_plugin", @@ -28,10 +53,6 @@ "key": "CreateLayout", "label": "Create Layout" }, - { - "key": "CreateLook", - "label": "Create Look" - }, { "key": "CreateMayaScene", "label": "Create Maya Scene" diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_aftereffects.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_aftereffects.json index cd080bf0f2..afadf48173 100644 --- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_aftereffects.json +++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_aftereffects.json @@ -29,13 +29,11 @@ "template_data": [ { "app_variant_label": "2020", - "app_variant": "2020", - "app_name": "aftereffects" + "app_variant": "2020" }, { "app_variant_label": "2021", - "app_variant": "2021", - "app_name": "aftereffects" + "app_variant": "2021" } ] } diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_blender.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_blender.json index 2501e94b50..e6e7381e9f 100644 --- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_blender.json +++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_blender.json @@ -20,26 +20,22 @@ "type": "raw-json" }, { - "type": "dict", + "type": "dict-modifiable", "key": "variants", - "children": [ - { - "type": "schema_template", - "name": "template_host_variant", - "template_data": [ - { - "app_variant_label": "2.83", - "app_variant": "2-83", - "app_name": "blender" - }, - { - "app_variant_label": "2.90", - "app_variant": "2-90", - "app_name": "blender" - } - ] - } - ] + "collapsible_key": true, + "dynamic_label": false, + "use_label_wrap": false, + "object_type": { + "type": "dict", + "collapsible": true, + "checkbox_key": "enabled", + "children": [ + { + "type": "schema_template", + "name": "template_host_variant_items" + } + ] + } } ] } diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_celaction.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_celaction.json index fbdad62a92..82be15c3b0 100644 --- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_celaction.json +++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_celaction.json @@ -29,10 +29,7 @@ "template_data": [ { "app_variant_label": "Local", - "app_variant": "Local", - "app_name": "celation", - "multiplatform": false, - "multipath_executables": false + "app_variant": "local" } ] } diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_djv.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_djv.json index 381437d4ff..a95cedf7c3 100644 --- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_djv.json +++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_djv.json @@ -20,19 +20,22 @@ "type": "raw-json" }, { - "type": "dict", + "type": "dict-modifiable", "key": "variants", - "children": [ - { - "type": "schema_template", - "name": "template_host_variant", - "template_data": { - "app_variant_label": "1.1", - "app_variant": "1-1", - "app_name": "djvview" + "collapsible_key": true, + "dynamic_label": false, + "use_label_wrap": false, + "object_type": { + "type": "dict", + "collapsible": true, + "checkbox_key": "enabled", + "children": [ + { + "type": "schema_template", + "name": "template_host_variant_items" } - } - ] + ] + } } ] } diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json index 8661916d06..58f37fa99b 100644 --- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json +++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_fusion.json @@ -29,13 +29,11 @@ "template_data": [ { "app_variant_label": "16", - "app_variant": "16", - "app_name": "fusion" + "app_variant": "16" }, { "app_variant_label": "9", - "app_variant": "9", - "app_name": "fusion" + "app_variant": "9" } ] } diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_harmony.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_harmony.json index 7c59b0febd..083885a53b 100644 --- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_harmony.json +++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_harmony.json @@ -29,13 +29,11 @@ "template_data": [ { "app_variant_label": "20", - "app_variant": "20", - "app_name": "harmony" + "app_variant": "20" }, { "app_variant_label": "17", - "app_variant": "17", - "app_name": "harmony" + "app_variant": "17" } ] } diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_houdini.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_houdini.json index 70e06d170d..22a5b2e737 100644 --- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_houdini.json +++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_houdini.json @@ -20,31 +20,22 @@ "type": "raw-json" }, { - "type": "dict", + "type": "dict-modifiable", "key": "variants", - "children": [ - { - "type": "schema_template", - "name": "template_host_variant", - "template_data": [ - { - "app_variant_label": "18.5", - "app_variant": "18-5", - "app_name": "houdini" - }, - { - "app_variant_label": "18", - "app_variant": "18", - "app_name": "houdini" - }, - { - "app_variant_label": "17", - "app_variant": "17", - "app_name": "houdini" - } - ] - } - ] + "collapsible_key": true, + "dynamic_label": false, + "use_label_wrap": false, + "object_type": { + "type": "dict", + "collapsible": true, + "checkbox_key": "enabled", + "children": [ + { + "type": "schema_template", + "name": "template_host_variant_items" + } + ] + } } ] } diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_maya.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_maya.json index 07c8aa0106..7c33671fa7 100644 --- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_maya.json +++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_maya.json @@ -20,31 +20,22 @@ "type": "raw-json" }, { - "type": "dict", + "type": "dict-modifiable", "key": "variants", - "children": [ - { - "type": "schema_template", - "name": "template_host_variant", - "template_data": [ - { - "app_variant_label": "2020", - "app_variant": "2020", - "app_name": "maya" - }, - { - "app_variant_label": "2019", - "app_variant": "2019", - "app_name": "maya" - }, - { - "app_variant_label": "2018", - "app_variant": "2018", - "app_name": "maya" - } - ] - } - ] + "collapsible_key": true, + "dynamic_label": false, + "use_label_wrap": false, + "object_type": { + "type": "dict", + "collapsible": true, + "checkbox_key": "enabled", + "children": [ + { + "type": "schema_template", + "name": "template_host_variant_items" + } + ] + } } ] } diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_mayabatch.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_mayabatch.json deleted file mode 100644 index bea59656af..0000000000 --- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_mayabatch.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "type": "dict", - "key": "mayabatch", - "label": "Autodesk Maya Batch", - "collapsible": true, - "checkbox_key": "enabled", - "children": [ - { - "type": "boolean", - "key": "enabled", - "label": "Enabled" - }, - { - "type": "schema_template", - "name": "template_host_unchangables" - }, - { - "key": "environment", - "label": "Environment", - "type": "raw-json" - }, - { - "type": "dict", - "key": "variants", - "children": [ - { - "type": "schema_template", - "name": "template_host_variant", - "template_data": [ - { - "app_variant_label": "2020", - "app_variant": "2020", - "app_name": "mayabatch" - }, - { - "app_variant_label": "2019", - "app_variant": "2019", - "app_name": "mayabatch" - }, - { - "app_variant_label": "2018", - "app_variant": "2018", - "app_name": "mayabatch" - } - ] - } - ] - } - ] -} diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_photoshop.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_photoshop.json index 6f67e29df2..9c21166b63 100644 --- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_photoshop.json +++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_photoshop.json @@ -29,13 +29,11 @@ "template_data": [ { "app_variant_label": "2020", - "app_variant": "2020", - "app_name": "photoshop" + "app_variant": "2020" }, { "app_variant_label": "2021", - "app_variant": "2021", - "app_name": "photoshop" + "app_variant": "2021" } ] } diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_resolve.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_resolve.json index 644e3046ce..ab2b86bf87 100644 --- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_resolve.json +++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_resolve.json @@ -29,8 +29,7 @@ "template_data": [ { "app_variant_label": "16", - "app_variant": "16", - "app_name": "resolve" + "app_variant": "16" } ] } diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_shell.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_shell.json index f2f9376029..e344f98594 100644 --- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_shell.json +++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_shell.json @@ -16,31 +16,22 @@ "type": "raw-json" }, { - "type": "dict", + "type": "dict-modifiable", "key": "variants", - "children": [ - { - "type": "schema_template", - "name": "template_host_variant", - "template_data": [ - { - "app_variant": "python_3-7", - "app_variant_label": "Python 3.7", - "app_name": "python" - }, - { - "app_variant": "python_2-7", - "app_variant_label": "Python 2.7", - "app_name": "python" - }, - { - "app_variant": "terminal", - "app_variant_label": "Terminal", - "app_name": "terminal" - } - ] - } - ] + "collapsible_key": true, + "dynamic_label": false, + "use_label_wrap": false, + "object_type": { + "type": "dict", + "collapsible": true, + "checkbox_key": "enabled", + "children": [ + { + "type": "schema_template", + "name": "template_host_variant_items" + } + ] + } } ] } diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_tvpaint.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_tvpaint.json index fa28c4448c..eac09be113 100644 --- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_tvpaint.json +++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_tvpaint.json @@ -20,26 +20,22 @@ "type": "raw-json" }, { - "type": "dict", + "type": "dict-modifiable", "key": "variants", - "children": [ - { - "type": "schema_template", - "name": "template_host_variant", - "template_data": [ - { - "app_variant_label": "Animation 11 (64bits)", - "app_variant": "animation_11-64bits", - "app_name": "tvpaint" - }, - { - "app_variant_label": "Animation 11 (32bits)", - "app_variant": "animation_11-32bits", - "app_name": "tvpaint" - } - ] - } - ] + "collapsible_key": true, + "dynamic_label": false, + "use_label_wrap": false, + "object_type": { + "type": "dict", + "collapsible": true, + "checkbox_key": "enabled", + "children": [ + { + "type": "schema_template", + "name": "template_host_variant_items" + } + ] + } } ] } diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/schema_unreal.json b/openpype/settings/entities/schemas/system_schema/host_settings/schema_unreal.json index e9d1b68130..c5096197d6 100644 --- a/openpype/settings/entities/schemas/system_schema/host_settings/schema_unreal.json +++ b/openpype/settings/entities/schemas/system_schema/host_settings/schema_unreal.json @@ -20,21 +20,22 @@ "type": "raw-json" }, { - "type": "dict", + "type": "dict-modifiable", "key": "variants", - "children": [ - { - "type": "schema_template", - "name": "template_host_variant", - "template_data": [ - { - "app_variant": "4-24", - "app_variant_label": "4.24", - "app_name": "unreal" - } - ] - } - ] + "collapsible_key": true, + "dynamic_label": false, + "use_label_wrap": false, + "object_type": { + "type": "dict", + "collapsible": true, + "checkbox_key": "enabled", + "children": [ + { + "type": "schema_template", + "name": "template_host_variant_items" + } + ] + } } ] } diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/template_host_variant.json b/openpype/settings/entities/schemas/system_schema/host_settings/template_host_variant.json index 10aab06466..33cde3d216 100644 --- a/openpype/settings/entities/schemas/system_schema/host_settings/template_host_variant.json +++ b/openpype/settings/entities/schemas/system_schema/host_settings/template_host_variant.json @@ -1,13 +1,7 @@ [ - { - "__default_values__": { - "multipath_executables": true, - "multiplatform": true - } - }, { "type": "dict", - "key": "{app_name}_{app_variant}", + "key": "{app_variant}", "label": "{app_variant_label}", "collapsible": true, "checkbox_key": "enabled", @@ -21,49 +15,11 @@ "type": "text", "key": "variant_label", "label": "Variant label", - "placeholder": "Only \"Label\" is used if not filled.", - "roles": ["developer"] + "placeholder": "< {app_variant} >" }, { - "type": "path", - "key": "executables", - "label": "Executables", - "multiplatform": "{multiplatform}", - "multipath": "{multipath_executables}" - }, - { - "type":"separator" - }, - { - "type": "dict", - "key": "arguments", - "label": "Arguments", - "use_label_wrap": false, - "children": [ - { - "key": "windows", - "label": "Windows", - "type": "list", - "object_type": "text" - }, - { - "key": "darwin", - "label": "MacOS", - "type": "list", - "object_type": "text" - }, - { - "key": "linux", - "label": "Linux", - "type": "list", - "object_type": "text" - } - ] - }, - { - "key": "environment", - "label": "Environment", - "type": "raw-json" + "type": "schema_template", + "name": "template_host_variant_items" } ] } diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/template_host_variant_items.json b/openpype/settings/entities/schemas/system_schema/host_settings/template_host_variant_items.json new file mode 100644 index 0000000000..bba4634c46 --- /dev/null +++ b/openpype/settings/entities/schemas/system_schema/host_settings/template_host_variant_items.json @@ -0,0 +1,43 @@ +[ + { + "type": "path", + "key": "executables", + "label": "Executables", + "multiplatform": true, + "multipath": true + }, + { + "type":"separator" + }, + { + "type": "dict", + "key": "arguments", + "label": "Arguments", + "use_label_wrap": false, + "children": [ + { + "key": "windows", + "label": "Windows", + "type": "list", + "object_type": "text" + }, + { + "key": "darwin", + "label": "MacOS", + "type": "list", + "object_type": "text" + }, + { + "key": "linux", + "label": "Linux", + "type": "list", + "object_type": "text" + } + ] + }, + { + "key": "environment", + "label": "Environment", + "type": "raw-json" + } +] diff --git a/openpype/settings/entities/schemas/system_schema/host_settings/template_nuke.json b/openpype/settings/entities/schemas/system_schema/host_settings/template_nuke.json index d99e0b9a85..3f25c7d72f 100644 --- a/openpype/settings/entities/schemas/system_schema/host_settings/template_nuke.json +++ b/openpype/settings/entities/schemas/system_schema/host_settings/template_nuke.json @@ -21,36 +21,22 @@ "type": "raw-json" }, { - "type": "dict", + "type": "dict-modifiable", "key": "variants", - "children": [ - { - "type": "schema_template", - "name": "template_host_variant", - "template_data": [ - { - "app_variant": "12-2", - "app_variant_label": "12.2", - "app_name": "{nuke_type}" - }, - { - "app_variant": "12-0", - "app_variant_label": "12.0", - "app_name": "{nuke_type}" - }, - { - "app_variant": "11-3", - "app_variant_label": "11.3", - "app_name": "{nuke_type}" - }, - { - "app_variant": "11-2", - "app_variant_label": "11.2", - "app_name": "{nuke_type}" - } - ] - } - ] + "collapsible_key": true, + "dynamic_label": false, + "use_label_wrap": false, + "object_type": { + "type": "dict", + "collapsible": true, + "checkbox_key": "enabled", + "children": [ + { + "type": "schema_template", + "name": "template_host_variant_items" + } + ] + } } ] } diff --git a/openpype/settings/entities/schemas/system_schema/schema_applications.json b/openpype/settings/entities/schemas/system_schema/schema_applications.json index 61d47df8b6..efdd021ede 100644 --- a/openpype/settings/entities/schemas/system_schema/schema_applications.json +++ b/openpype/settings/entities/schemas/system_schema/schema_applications.json @@ -9,10 +9,6 @@ "type": "schema", "name": "schema_maya" }, - { - "type": "schema", - "name": "schema_mayabatch" - }, { "type": "schema_template", "name": "template_nuke", diff --git a/openpype/settings/entities/schemas/system_schema/schema_modules.json b/openpype/settings/entities/schemas/system_schema/schema_modules.json index 8bfb0e90dc..a30cafd0c2 100644 --- a/openpype/settings/entities/schemas/system_schema/schema_modules.json +++ b/openpype/settings/entities/schemas/system_schema/schema_modules.json @@ -42,6 +42,11 @@ "key": "enabled", "label": "Enabled" }, + { + "type": "boolean", + "key": "auto_stop", + "label": "Auto stop timer" + }, { "type": "number", "decimal": 2, @@ -77,7 +82,7 @@ }, { "type": "dict", "key": "sync_server", - "label": "Sync Server", + "label": "Site Sync", "collapsible": true, "checkbox_key": "enabled", "children": [{ @@ -176,20 +181,6 @@ "label": "Enabled" } ] - }, - { - "type": "dict", - "key": "idle_manager", - "label": "Idle Manager", - "collapsible": true, - "checkbox_key": "enabled", - "children": [ - { - "type": "boolean", - "key": "enabled", - "label": "Enabled" - } - ] } ] } diff --git a/openpype/settings/lib.py b/openpype/settings/lib.py index 60a51c01a0..3bf2141808 100644 --- a/openpype/settings/lib.py +++ b/openpype/settings/lib.py @@ -489,7 +489,7 @@ def apply_local_settings_on_system_settings(system_settings, local_settings): # TODO This is temporary fix until launch arguments will be stored # per platform and not per executable. # - local settings store only executable - new_executables = [[executable, ""]] + new_executables = [executable] new_executables.extend(platform_executables) variants[app_name]["executables"] = new_executables @@ -645,13 +645,22 @@ def apply_local_settings_on_project_settings( sync_server_config["remote_site"] = remote_site -def get_system_settings(clear_metadata=True): +def get_system_settings(clear_metadata=True, exclude_locals=None): """System settings with applied studio overrides.""" default_values = get_default_settings()[SYSTEM_SETTINGS_KEY] studio_values = get_studio_system_settings_overrides() result = apply_overrides(default_values, studio_values) + + # Clear overrides metadata from settings if clear_metadata: clear_metadata_from_settings(result) + + # Apply local settings + # Default behavior is based on `clear_metadata` value + if exclude_locals is None: + exclude_locals = not clear_metadata + + if not exclude_locals: # TODO local settings may be required to apply for environments local_settings = get_local_settings() apply_local_settings_on_system_settings(result, local_settings) @@ -659,40 +668,52 @@ def get_system_settings(clear_metadata=True): return result -def get_default_project_settings(clear_metadata=True, exclude_locals=False): +def get_default_project_settings(clear_metadata=True, exclude_locals=None): """Project settings with applied studio's default project overrides.""" default_values = get_default_settings()[PROJECT_SETTINGS_KEY] studio_values = get_studio_project_settings_overrides() result = apply_overrides(default_values, studio_values) + # Clear overrides metadata from settings if clear_metadata: clear_metadata_from_settings(result) - if not exclude_locals: - local_settings = get_local_settings() - apply_local_settings_on_project_settings( - result, local_settings, None - ) + + # Apply local settings + if exclude_locals is None: + exclude_locals = not clear_metadata + + if not exclude_locals: + local_settings = get_local_settings() + apply_local_settings_on_project_settings( + result, local_settings, None + ) return result -def get_default_anatomy_settings(clear_metadata=True, exclude_locals=False): +def get_default_anatomy_settings(clear_metadata=True, exclude_locals=None): """Project anatomy data with applied studio's default project overrides.""" default_values = get_default_settings()[PROJECT_ANATOMY_KEY] studio_values = get_studio_project_anatomy_overrides() - # TODO uncomment and remove hotfix result when overrides of anatomy - # are stored correctly. result = apply_overrides(default_values, studio_values) + # Clear overrides metadata from settings if clear_metadata: clear_metadata_from_settings(result) - if not exclude_locals: - local_settings = get_local_settings() - apply_local_settings_on_anatomy_settings( - result, local_settings, None - ) + + # Apply local settings + if exclude_locals is None: + exclude_locals = not clear_metadata + + if not exclude_locals: + local_settings = get_local_settings() + apply_local_settings_on_anatomy_settings( + result, local_settings, None + ) return result -def get_anatomy_settings(project_name, site_name=None, exclude_locals=False): +def get_anatomy_settings( + project_name, site_name=None, clear_metadata=True, exclude_locals=None +): """Project anatomy data with applied studio and project overrides.""" if not project_name: raise ValueError( @@ -709,7 +730,13 @@ def get_anatomy_settings(project_name, site_name=None, exclude_locals=False): for key, value in project_overrides.items(): result[key] = value - clear_metadata_from_settings(result) + # Clear overrides metadata from settings + if clear_metadata: + clear_metadata_from_settings(result) + + # Apply local settings + if exclude_locals is None: + exclude_locals = not clear_metadata if not exclude_locals: local_settings = get_local_settings() @@ -719,7 +746,9 @@ def get_anatomy_settings(project_name, site_name=None, exclude_locals=False): return result -def get_project_settings(project_name, exclude_locals=False): +def get_project_settings( + project_name, clear_metadata=True, exclude_locals=None +): """Project settings with applied studio and project overrides.""" if not project_name: raise ValueError( @@ -733,7 +762,14 @@ def get_project_settings(project_name, exclude_locals=False): ) result = apply_overrides(studio_overrides, project_overrides) - clear_metadata_from_settings(result) + + # Clear overrides metadata from settings + if clear_metadata: + clear_metadata_from_settings(result) + + # Apply local settings + if exclude_locals is None: + exclude_locals = not clear_metadata if not exclude_locals: local_settings = get_local_settings() diff --git a/openpype/tools/launcher/window.py b/openpype/tools/launcher/window.py index a89e724f1c..c0aeec7d2f 100644 --- a/openpype/tools/launcher/window.py +++ b/openpype/tools/launcher/window.py @@ -11,6 +11,7 @@ from avalon.tools import lib as tools_lib from avalon.tools.widgets import AssetWidget from avalon.vendor import qtawesome from .models import ProjectModel +from .lib import get_action_label from .widgets import ( ProjectBar, ActionBar, @@ -407,7 +408,7 @@ class LauncherWindow(QtWidgets.QDialog): self.discover_actions() def on_action_clicked(self, action): - self.echo("Running action: {}".format(action.name)) + self.echo("Running action: {}".format(get_action_label(action))) self.run_action(action) def on_history_action(self, history_data): diff --git a/openpype/tools/settings/local_settings/apps_widget.py b/openpype/tools/settings/local_settings/apps_widget.py index bc27a3c1c4..2e12c010d1 100644 --- a/openpype/tools/settings/local_settings/apps_widget.py +++ b/openpype/tools/settings/local_settings/apps_widget.py @@ -10,12 +10,20 @@ from .constants import CHILD_OFFSET class AppVariantWidget(QtWidgets.QWidget): exec_placeholder = "< Specific path for this machine >" - def __init__(self, group_label, variant_entity, parent): + def __init__(self, group_label, variant_name, variant_entity, parent): super(AppVariantWidget, self).__init__(parent) self.executable_input_widget = None + variant_label = variant_entity.label + if variant_label is None: + parent_entity = variant_entity.parent + if hasattr(parent_entity, "get_key_label"): + variant_label = parent_entity.get_key_label(variant_name) - label = " ".join([group_label, variant_entity.label]) + if not variant_label: + variant_label = variant_name + + label = " ".join([group_label, variant_label]) expading_widget = ExpandingWidget(label, self) content_widget = QtWidgets.QWidget(expading_widget) @@ -102,7 +110,7 @@ class AppGroupWidget(QtWidgets.QWidget): valid_variants = {} for key, entity in group_entity["variants"].items(): - if entity["enabled"].value: + if "enabled" not in entity or entity["enabled"].value: valid_variants[key] = entity group_label = group_entity.label @@ -114,7 +122,7 @@ class AppGroupWidget(QtWidgets.QWidget): widgets_by_variant_name = {} for variant_name, variant_entity in valid_variants.items(): variant_widget = AppVariantWidget( - group_label, variant_entity, content_widget + group_label, variant_name, variant_entity, content_widget ) widgets_by_variant_name[variant_name] = variant_widget content_layout.addWidget(variant_widget) @@ -173,7 +181,10 @@ class LocalApplicationsWidgets(QtWidgets.QWidget): # Check if has enabled any variant enabled_variant = False for variant_entity in entity["variants"].values(): - if variant_entity["enabled"].value: + if ( + "enabled" not in variant_entity + or variant_entity["enabled"].value + ): enabled_variant = True break diff --git a/openpype/tools/settings/local_settings/general_widget.py b/openpype/tools/settings/local_settings/general_widget.py index 7732157122..e820d8ab8b 100644 --- a/openpype/tools/settings/local_settings/general_widget.py +++ b/openpype/tools/settings/local_settings/general_widget.py @@ -5,28 +5,16 @@ class LocalGeneralWidgets(QtWidgets.QWidget): def __init__(self, parent): super(LocalGeneralWidgets, self).__init__(parent) - local_site_name_input = QtWidgets.QLineEdit(self) - - layout = QtWidgets.QFormLayout(self) - layout.setContentsMargins(0, 0, 0, 0) - - layout.addRow("Local site label", local_site_name_input) - - self.local_site_name_input = local_site_name_input def update_local_settings(self, value): - site_label = "" - if value: - site_label = value.get("site_label", site_label) - self.local_site_name_input.setText(site_label) + return + + # RETURNING EARLY TO HIDE WIDGET WITHOUT CONTENT def settings_value(self): # Add changed # If these have changed then output = {} - local_site_name = self.local_site_name_input.text() - if local_site_name: - output["site_label"] = local_site_name - # Do not return output yet since we don't have mechanism to save or - # load these data through api calls + # TEMPORARILY EMPTY AS THERE IS NOTHING TO PUT HERE + return output diff --git a/openpype/tools/settings/local_settings/window.py b/openpype/tools/settings/local_settings/window.py index b6ca56d348..a12a2289b5 100644 --- a/openpype/tools/settings/local_settings/window.py +++ b/openpype/tools/settings/local_settings/window.py @@ -80,6 +80,7 @@ class LocalSettingsWidget(QtWidgets.QWidget): general_widget = LocalGeneralWidgets(general_content) general_layout.addWidget(general_widget) + general_expand_widget.hide() self.main_layout.addWidget(general_expand_widget) @@ -126,9 +127,9 @@ class LocalSettingsWidget(QtWidgets.QWidget): self.system_settings.reset() self.project_settings.reset() - self.general_widget.update_local_settings( - value.get(LOCAL_GENERAL_KEY) - ) + # self.general_widget.update_local_settings( + # value.get(LOCAL_GENERAL_KEY) + # ) self.app_widget.update_local_settings( value.get(LOCAL_APPS_KEY) ) @@ -138,9 +139,9 @@ class LocalSettingsWidget(QtWidgets.QWidget): def settings_value(self): output = {} - general_value = self.general_widget.settings_value() - if general_value: - output[LOCAL_GENERAL_KEY] = general_value + # general_value = self.general_widget.settings_value() + # if general_value: + # output[LOCAL_GENERAL_KEY] = general_value app_value = self.app_widget.settings_value() if app_value: diff --git a/openpype/tools/settings/settings/style/__init__.py b/openpype/tools/settings/settings/style/__init__.py index 9bb5e851b4..5a57642ee1 100644 --- a/openpype/tools/settings/settings/style/__init__.py +++ b/openpype/tools/settings/settings/style/__init__.py @@ -1,4 +1,5 @@ import os +from openpype import resources def load_stylesheet(): @@ -9,4 +10,4 @@ def load_stylesheet(): def app_icon_path(): - return os.path.join(os.path.dirname(__file__), "openpype_icon.png") + return resources.pype_icon_filepath() diff --git a/openpype/tools/settings/settings/style/pype_icon.png b/openpype/tools/settings/settings/style/pype_icon.png deleted file mode 100644 index bfacf6eeed..0000000000 Binary files a/openpype/tools/settings/settings/style/pype_icon.png and /dev/null differ diff --git a/openpype/tools/settings/settings/widgets/dict_mutable_widget.py b/openpype/tools/settings/settings/widgets/dict_mutable_widget.py index 3b5f15f519..9bea89c0d6 100644 --- a/openpype/tools/settings/settings/widgets/dict_mutable_widget.py +++ b/openpype/tools/settings/settings/widgets/dict_mutable_widget.py @@ -103,7 +103,10 @@ class ModifiableDictEmptyItem(QtWidgets.QWidget): self.key_is_valid = KEY_REGEX.match(key) self.is_duplicated = self.entity_widget.is_key_duplicated(key) key_input_state = "" - if self.is_duplicated or not self.key_is_valid: + # Collapsible key and empty key are not invalid + if self.collapsible_key and self.key_input.text() == "": + pass + elif self.is_duplicated or not self.key_is_valid: key_input_state = "invalid" elif key != "": key_input_state = "modified" @@ -550,7 +553,9 @@ class DictMutableKeysWidget(BaseWidget): label = self.entity.label body_widget = None + content_left_margin = 0 if label: + content_left_margin = CHILD_OFFSET body_widget = ExpandingWidget(label, self) main_layout.addWidget(body_widget) label = None @@ -565,7 +570,9 @@ class DictMutableKeysWidget(BaseWidget): content_widget.setObjectName("ContentWidget") content_widget.setProperty("content_state", content_state) content_layout = QtWidgets.QVBoxLayout(content_widget) - content_layout.setContentsMargins(CHILD_OFFSET, 5, 0, bottom_margin) + content_layout.setContentsMargins( + content_left_margin, 5, 0, bottom_margin + ) if body_widget is None: main_layout.addWidget(content_widget) diff --git a/openpype/tools/tray/pype_info_widget.py b/openpype/tools/tray/pype_info_widget.py index dbff36eca7..bbb92f175f 100644 --- a/openpype/tools/tray/pype_info_widget.py +++ b/openpype/tools/tray/pype_info_widget.py @@ -111,6 +111,13 @@ class EnvironmentsView(QtWidgets.QTreeView): else: return super(EnvironmentsView, self).keyPressEvent(event) + def wheelEvent(self, event): + if not self.hasFocus(): + event.ignore() + return + return super(EnvironmentsView, self).wheelEvent(event) + + class ClickableWidget(QtWidgets.QWidget): clicked = QtCore.Signal() @@ -195,8 +202,6 @@ class CollapsibleWidget(QtWidgets.QWidget): class PypeInfoWidget(QtWidgets.QWidget): - not_applicable = "N/A" - def __init__(self, parent=None): super(PypeInfoWidget, self).__init__(parent) @@ -206,17 +211,21 @@ class PypeInfoWidget(QtWidgets.QWidget): self.setWindowIcon(icon) self.setWindowTitle("OpenPype info") + scroll_area = QtWidgets.QScrollArea(self) + info_widget = PypeInfoSubWidget(scroll_area) + + scroll_area.setWidget(info_widget) + scroll_area.setWidgetResizable(True) + main_layout = QtWidgets.QVBoxLayout(self) - main_layout.setAlignment(QtCore.Qt.AlignTop) - main_layout.addWidget(self._create_openpype_info_widget(), 0) - main_layout.addWidget(self._create_separator(), 0) - main_layout.addWidget(self._create_workstation_widget(), 0) - main_layout.addWidget(self._create_separator(), 0) - main_layout.addWidget(self._create_local_settings_widget(), 0) - main_layout.addWidget(self._create_separator(), 0) - main_layout.addWidget(self._create_environ_widget(), 1) + main_layout.addWidget(scroll_area, 1) main_layout.addWidget(self._create_btns_section(), 0) + self.resize(740, 540) + + self.scroll_area = scroll_area + self.info_widget = info_widget + def _create_btns_section(self): btns_widget = QtWidgets.QWidget(self) btns_layout = QtWidgets.QHBoxLayout(btns_widget) @@ -268,6 +277,24 @@ class PypeInfoWidget(QtWidgets.QWidget): mime_data ) + +class PypeInfoSubWidget(QtWidgets.QWidget): + not_applicable = "N/A" + + def __init__(self, parent=None): + super(PypeInfoSubWidget, self).__init__(parent) + + main_layout = QtWidgets.QVBoxLayout(self) + main_layout.setContentsMargins(0, 0, 0, 0) + main_layout.setAlignment(QtCore.Qt.AlignTop) + main_layout.addWidget(self._create_openpype_info_widget(), 0) + main_layout.addWidget(self._create_separator(), 0) + main_layout.addWidget(self._create_workstation_widget(), 0) + main_layout.addWidget(self._create_separator(), 0) + main_layout.addWidget(self._create_local_settings_widget(), 0) + main_layout.addWidget(self._create_separator(), 0) + main_layout.addWidget(self._create_environ_widget(), 1) + def _create_separator(self): separator_widget = QtWidgets.QWidget(self) separator_widget.setStyleSheet("background: #222222;") @@ -322,6 +349,7 @@ class PypeInfoWidget(QtWidgets.QWidget): ) wokstation_info_widget.set_content_widget(info_widget) + wokstation_info_widget.toggle_content() return wokstation_info_widget @@ -342,6 +370,7 @@ class PypeInfoWidget(QtWidgets.QWidget): env_widget = CollapsibleWidget("Environments", self) env_view = EnvironmentsView(env_widget) + env_view.setMinimumHeight(300) env_widget.set_content_widget(env_view) @@ -363,7 +392,7 @@ class PypeInfoWidget(QtWidgets.QWidget): "version_value": "OpenPype version:", "executable": "OpenPype executable:", "pype_root": "OpenPype location:", - "mongo_url": "OpenPype Mongo URL:" + "mongo_url": "OpenPype Mongo URL:" } # Prepare keys order keys_order = ["version_value", "executable", "pype_root", "mongo_url"] diff --git a/openpype/version.py b/openpype/version.py index f85ea13ac8..dedf799055 100644 --- a/openpype/version.py +++ b/openpype/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """Package declaring Pype version.""" -__version__ = "3.0.0-beta" +__version__ = "3.0.0-beta2" diff --git a/poetry.lock b/poetry.lock index 6695a7bcca..767aeee500 100644 --- a/poetry.lock +++ b/poetry.lock @@ -80,7 +80,7 @@ python-dateutil = ">=2.7.0" [[package]] name = "astroid" -version = "2.5.1" +version = "2.5.2" description = "An abstract syntax tree for Python with inference support." category = "dev" optional = false @@ -123,14 +123,14 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (> [[package]] name = "autopep8" -version = "1.5.5" +version = "1.5.6" description = "A tool that automatically formats Python code to conform to the PEP 8 style guide" category = "dev" optional = false python-versions = "*" [package.dependencies] -pycodestyle = ">=2.6.0" +pycodestyle = ">=2.7.0" toml = "*" [[package]] @@ -232,6 +232,14 @@ python-versions = "*" [package.extras] test = ["flake8 (==3.7.8)", "hypothesis (==3.55.3)"] +[[package]] +name = "coolname" +version = "1.1.0" +description = "Random name and slug generator" +category = "main" +optional = false +python-versions = "*" + [[package]] name = "coverage" version = "5.5" @@ -245,7 +253,7 @@ toml = ["toml"] [[package]] name = "cryptography" -version = "3.4.6" +version = "3.4.7" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." category = "main" optional = false @@ -290,7 +298,7 @@ trio = ["trio (>=0.14.0)", "sniffio (>=1.1)"] [[package]] name = "docutils" -version = "0.16" +version = "0.17" description = "Docutils -- Python Documentation Utilities" category = "dev" optional = false @@ -306,17 +314,17 @@ python-versions = "*" [[package]] name = "flake8" -version = "3.8.4" +version = "3.9.0" description = "the modular source code checker: pep8 pyflakes and co" category = "dev" optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" [package.dependencies] importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} mccabe = ">=0.6.0,<0.7.0" -pycodestyle = ">=2.6.0a1,<2.7.0" -pyflakes = ">=2.2.0,<2.3.0" +pycodestyle = ">=2.7.0,<2.8.0" +pyflakes = ">=2.3.0,<2.4.0" [[package]] name = "ftrack-python-api" @@ -346,7 +354,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "google-api-core" -version = "1.26.1" +version = "1.26.3" description = "Google API client core library" category = "main" optional = false @@ -384,7 +392,7 @@ uritemplate = ">=3.0.0,<4dev" [[package]] name = "google-auth" -version = "1.27.1" +version = "1.28.0" description = "Google Authentication Library" category = "main" optional = false @@ -429,7 +437,7 @@ grpc = ["grpcio (>=1.0.0)"] [[package]] name = "httplib2" -version = "0.19.0" +version = "0.19.1" description = "A comprehensive HTTP client library." category = "main" optional = false @@ -456,7 +464,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "importlib-metadata" -version = "3.7.2" +version = "3.10.0" description = "Read metadata from Python packages" category = "main" optional = false @@ -468,7 +476,7 @@ zipp = ">=0.5" [package.extras] docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"] +testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"] [[package]] name = "iniconfig" @@ -480,7 +488,7 @@ python-versions = "*" [[package]] name = "isort" -version = "5.7.0" +version = "5.8.0" description = "A Python utility / library to sort Python imports." category = "dev" optional = false @@ -579,11 +587,11 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt [[package]] name = "lazy-object-proxy" -version = "1.5.2" +version = "1.6.0" description = "A fast and thorough lazy object proxy." category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [[package]] name = "log4mongo" @@ -653,7 +661,7 @@ pyparsing = ">=2.0.2" [[package]] name = "parso" -version = "0.8.1" +version = "0.8.2" description = "A Python Parser" category = "dev" optional = false @@ -676,7 +684,7 @@ six = "*" [[package]] name = "pillow" -version = "8.1.2" +version = "8.2.0" description = "Python Imaging Library (Fork)" category = "main" optional = false @@ -698,7 +706,7 @@ dev = ["pre-commit", "tox"] [[package]] name = "protobuf" -version = "3.15.6" +version = "3.15.7" description = "Protocol Buffers" category = "main" optional = false @@ -752,7 +760,7 @@ python-versions = "*" [[package]] name = "pycodestyle" -version = "2.6.0" +version = "2.7.0" description = "Python style guide checker" category = "dev" optional = false @@ -780,7 +788,7 @@ snowballstemmer = "*" [[package]] name = "pyflakes" -version = "2.2.0" +version = "2.3.1" description = "passive checker of Python programs" category = "dev" optional = false @@ -796,14 +804,14 @@ python-versions = ">=3.5" [[package]] name = "pylint" -version = "2.7.2" +version = "2.7.4" description = "python code static checker" category = "dev" optional = false python-versions = "~=3.6" [package.dependencies] -astroid = ">=2.5.1,<2.6" +astroid = ">=2.5.2,<2.7" colorama = {version = "*", markers = "sys_platform == \"win32\""} isort = ">=4.2.5,<6" mccabe = ">=0.6,<0.7" @@ -921,7 +929,7 @@ python-versions = ">=3.5" [[package]] name = "pytest" -version = "6.2.2" +version = "6.2.3" description = "pytest: simple powerful testing with Python" category = "dev" optional = false @@ -1112,7 +1120,7 @@ python-versions = "*" [[package]] name = "sphinx" -version = "3.5.2" +version = "3.5.3" description = "Python documentation generator" category = "dev" optional = false @@ -1271,7 +1279,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "tqdm" -version = "4.59.0" +version = "4.60.0" description = "Fast, Extensible Progress Meter" category = "dev" optional = false @@ -1308,16 +1316,16 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "urllib3" -version = "1.26.3" +version = "1.26.4" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" [package.extras] -brotli = ["brotlipy (>=0.6.0)"] secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] +brotli = ["brotlipy (>=0.6.0)"] [[package]] name = "wcwidth" @@ -1348,7 +1356,7 @@ python-versions = "*" [[package]] name = "wsrpc-aiohttp" -version = "3.1.1" +version = "3.1.2" description = "WSRPC is the RPC over WebSocket for aiohttp" category = "main" optional = false @@ -1391,7 +1399,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pyt [metadata] lock-version = "1.1" python-versions = "3.7.*" -content-hash = "4905515073ad2bf2a8517d513d68e48669b6a829f24e540b2dd60bc70cbea26b" +content-hash = "a8c9915ce3096b74b9328a632911a759780844d368fa1d6d0fbd7c5d7d4536cf" [metadata.files] acre = [] @@ -1455,8 +1463,8 @@ arrow = [ {file = "arrow-0.17.0.tar.gz", hash = "sha256:ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2bf6ed4"}, ] astroid = [ - {file = "astroid-2.5.1-py3-none-any.whl", hash = "sha256:21d735aab248253531bb0f1e1e6d068f0ee23533e18ae8a6171ff892b98297cf"}, - {file = "astroid-2.5.1.tar.gz", hash = "sha256:cfc35498ee64017be059ceffab0a25bedf7548ab76f2bea691c5565896e7128d"}, + {file = "astroid-2.5.2-py3-none-any.whl", hash = "sha256:cd80bf957c49765dce6d92c43163ff9d2abc43132ce64d4b1b47717c6d2522df"}, + {file = "astroid-2.5.2.tar.gz", hash = "sha256:6b0ed1af831570e500e2437625979eaa3b36011f66ddfc4ce930128610258ca9"}, ] async-timeout = [ {file = "async-timeout-3.0.1.tar.gz", hash = "sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f"}, @@ -1471,8 +1479,8 @@ attrs = [ {file = "attrs-20.3.0.tar.gz", hash = "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"}, ] autopep8 = [ - {file = "autopep8-1.5.5-py2.py3-none-any.whl", hash = "sha256:9e136c472c475f4ee4978b51a88a494bfcd4e3ed17950a44a988d9e434837bea"}, - {file = "autopep8-1.5.5.tar.gz", hash = "sha256:cae4bc0fb616408191af41d062d7ec7ef8679c7f27b068875ca3a9e2878d5443"}, + {file = "autopep8-1.5.6-py2.py3-none-any.whl", hash = "sha256:f01b06a6808bc31698db907761e5890eb2295e287af53f6693b39ce55454034a"}, + {file = "autopep8-1.5.6.tar.gz", hash = "sha256:5454e6e9a3d02aae38f866eec0d9a7de4ab9f93c10a273fb0340f3d6d09f7514"}, ] babel = [ {file = "Babel-2.9.0-py2.py3-none-any.whl", hash = "sha256:9d35c22fcc79893c3ecc85ac4a56cde1ecf3f19c540bba0922308a6c06ca6fa5"}, @@ -1549,6 +1557,10 @@ commonmark = [ {file = "commonmark-0.9.1-py2.py3-none-any.whl", hash = "sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9"}, {file = "commonmark-0.9.1.tar.gz", hash = "sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60"}, ] +coolname = [ + {file = "coolname-1.1.0-py2.py3-none-any.whl", hash = "sha256:e6a83a0ac88640f4f3d2070438dbe112fe80cfebc119c93bd402976ec84c0978"}, + {file = "coolname-1.1.0.tar.gz", hash = "sha256:410fe6ea9999bf96f2856ef0c726d5f38782bbefb7bb1aca0e91e0dc98ed09e3"}, +] coverage = [ {file = "coverage-5.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:b6d534e4b2ab35c9f93f46229363e17f63c53ad01330df9f2d6bd1187e5eaacf"}, {file = "coverage-5.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:b7895207b4c843c76a25ab8c1e866261bcfe27bfaa20c192de5190121770672b"}, @@ -1604,18 +1616,18 @@ coverage = [ {file = "coverage-5.5.tar.gz", hash = "sha256:ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"}, ] cryptography = [ - {file = "cryptography-3.4.6-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:57ad77d32917bc55299b16d3b996ffa42a1c73c6cfa829b14043c561288d2799"}, - {file = "cryptography-3.4.6-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:4169a27b818de4a1860720108b55a2801f32b6ae79e7f99c00d79f2a2822eeb7"}, - {file = "cryptography-3.4.6-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:93cfe5b7ff006de13e1e89830810ecbd014791b042cbe5eec253be11ac2b28f3"}, - {file = "cryptography-3.4.6-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:5ecf2bcb34d17415e89b546dbb44e73080f747e504273e4d4987630493cded1b"}, - {file = "cryptography-3.4.6-cp36-abi3-manylinux2014_x86_64.whl", hash = "sha256:fec7fb46b10da10d9e1d078d1ff8ed9e05ae14f431fdbd11145edd0550b9a964"}, - {file = "cryptography-3.4.6-cp36-abi3-win32.whl", hash = "sha256:df186fcbf86dc1ce56305becb8434e4b6b7504bc724b71ad7a3239e0c9d14ef2"}, - {file = "cryptography-3.4.6-cp36-abi3-win_amd64.whl", hash = "sha256:66b57a9ca4b3221d51b237094b0303843b914b7d5afd4349970bb26518e350b0"}, - {file = "cryptography-3.4.6-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:066bc53f052dfeda2f2d7c195cf16fb3e5ff13e1b6b7415b468514b40b381a5b"}, - {file = "cryptography-3.4.6-pp36-pypy36_pp73-manylinux2014_x86_64.whl", hash = "sha256:600cf9bfe75e96d965509a4c0b2b183f74a4fa6f5331dcb40fb7b77b7c2484df"}, - {file = "cryptography-3.4.6-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:0923ba600d00718d63a3976f23cab19aef10c1765038945628cd9be047ad0336"}, - {file = "cryptography-3.4.6-pp37-pypy37_pp73-manylinux2014_x86_64.whl", hash = "sha256:9e98b452132963678e3ac6c73f7010fe53adf72209a32854d55690acac3f6724"}, - {file = "cryptography-3.4.6.tar.gz", hash = "sha256:2d32223e5b0ee02943f32b19245b61a62db83a882f0e76cc564e1cec60d48f87"}, + {file = "cryptography-3.4.7-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:3d8427734c781ea5f1b41d6589c293089704d4759e34597dce91014ac125aad1"}, + {file = "cryptography-3.4.7-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:8e56e16617872b0957d1c9742a3f94b43533447fd78321514abbe7db216aa250"}, + {file = "cryptography-3.4.7-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:37340614f8a5d2fb9aeea67fd159bfe4f5f4ed535b1090ce8ec428b2f15a11f2"}, + {file = "cryptography-3.4.7-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:240f5c21aef0b73f40bb9f78d2caff73186700bf1bc6b94285699aff98cc16c6"}, + {file = "cryptography-3.4.7-cp36-abi3-manylinux2014_x86_64.whl", hash = "sha256:1e056c28420c072c5e3cb36e2b23ee55e260cb04eee08f702e0edfec3fb51959"}, + {file = "cryptography-3.4.7-cp36-abi3-win32.whl", hash = "sha256:0f1212a66329c80d68aeeb39b8a16d54ef57071bf22ff4e521657b27372e327d"}, + {file = "cryptography-3.4.7-cp36-abi3-win_amd64.whl", hash = "sha256:de4e5f7f68220d92b7637fc99847475b59154b7a1b3868fb7385337af54ac9ca"}, + {file = "cryptography-3.4.7-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:26965837447f9c82f1855e0bc8bc4fb910240b6e0d16a664bb722df3b5b06873"}, + {file = "cryptography-3.4.7-pp36-pypy36_pp73-manylinux2014_x86_64.whl", hash = "sha256:eb8cc2afe8b05acbd84a43905832ec78e7b3873fb124ca190f574dca7389a87d"}, + {file = "cryptography-3.4.7-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:7ec5d3b029f5fa2b179325908b9cd93db28ab7b85bb6c1db56b10e0b54235177"}, + {file = "cryptography-3.4.7-pp37-pypy37_pp73-manylinux2014_x86_64.whl", hash = "sha256:ee77aa129f481be46f8d92a1a7db57269a2f23052d5f2433b4621bb457081cc9"}, + {file = "cryptography-3.4.7.tar.gz", hash = "sha256:3d10de8116d25649631977cb37da6cbdd2d6fa0e0281d014a5b7d337255ca713"}, ] cx-freeze = [ {file = "cx_Freeze-6.5.3-cp36-cp36m-win32.whl", hash = "sha256:0a1babae574546b622303da53e1a9829aa3a7e53e62b41eb260250220f83164b"}, @@ -1633,15 +1645,15 @@ dnspython = [ {file = "dnspython-2.1.0.zip", hash = "sha256:e4a87f0b573201a0f3727fa18a516b055fd1107e0e5477cded4a2de497df1dd4"}, ] docutils = [ - {file = "docutils-0.16-py2.py3-none-any.whl", hash = "sha256:0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af"}, - {file = "docutils-0.16.tar.gz", hash = "sha256:c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc"}, + {file = "docutils-0.17-py2.py3-none-any.whl", hash = "sha256:a71042bb7207c03d5647f280427f14bfbd1a65c9eb84f4b341d85fafb6bb4bdf"}, + {file = "docutils-0.17.tar.gz", hash = "sha256:e2ffeea817964356ba4470efba7c2f42b6b0de0b04e66378507e3e2504bbff4c"}, ] evdev = [ {file = "evdev-1.4.0.tar.gz", hash = "sha256:8782740eb1a86b187334c07feb5127d3faa0b236e113206dfe3ae8f77fb1aaf1"}, ] flake8 = [ - {file = "flake8-3.8.4-py2.py3-none-any.whl", hash = "sha256:749dbbd6bfd0cf1318af27bf97a14e28e5ff548ef8e5b1566ccfb25a11e7c839"}, - {file = "flake8-3.8.4.tar.gz", hash = "sha256:aadae8761ec651813c24be05c6f7b4680857ef6afaae4651a4eccaef97ce6c3b"}, + {file = "flake8-3.9.0-py2.py3-none-any.whl", hash = "sha256:12d05ab02614b6aee8df7c36b97d1a3b2372761222b19b58621355e82acddcff"}, + {file = "flake8-3.9.0.tar.gz", hash = "sha256:78873e372b12b093da7b5e5ed302e8ad9e988b38b063b61ad937f26ca58fc5f0"}, ] ftrack-python-api = [ {file = "ftrack-python-api-2.0.0.tar.gz", hash = "sha256:dd6f02c31daf5a10078196dc9eac4671e4297c762fbbf4df98de668ac12281d9"}, @@ -1651,16 +1663,16 @@ future = [ {file = "future-0.18.2.tar.gz", hash = "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"}, ] google-api-core = [ - {file = "google-api-core-1.26.1.tar.gz", hash = "sha256:23b0df512c4cc8729793f8992edb350e3211f5fd0ec007afb1599864b421beef"}, - {file = "google_api_core-1.26.1-py2.py3-none-any.whl", hash = "sha256:c383206f0f87545d3e658c4f8dc3b18a8457610fdbd791a15757c5b42d1e0e7f"}, + {file = "google-api-core-1.26.3.tar.gz", hash = "sha256:b914345c7ea23861162693a27703bab804a55504f7e6e9abcaff174d80df32ac"}, + {file = "google_api_core-1.26.3-py2.py3-none-any.whl", hash = "sha256:099762d4b4018cd536bcf85136bf337957da438807572db52f21dc61251be089"}, ] google-api-python-client = [ {file = "google-api-python-client-1.12.8.tar.gz", hash = "sha256:f3b9684442eec2cfe9f9bb48e796ef919456b82142c7528c5fd527e5224f08bb"}, {file = "google_api_python_client-1.12.8-py2.py3-none-any.whl", hash = "sha256:3c4c4ca46b5c21196bec7ee93453443e477d82cbfa79234d1ce0645f81170eaf"}, ] google-auth = [ - {file = "google-auth-1.27.1.tar.gz", hash = "sha256:d8958af6968e4ecd599f82357ebcfeb126f826ed0656126ad68416f810f7531e"}, - {file = "google_auth-1.27.1-py2.py3-none-any.whl", hash = "sha256:63a5636d7eacfe6ef5b7e36e112b3149fa1c5b5ad77dd6df54910459bcd6b89f"}, + {file = "google-auth-1.28.0.tar.gz", hash = "sha256:9bd436d19ab047001a1340720d2b629eb96dd503258c524921ec2af3ee88a80e"}, + {file = "google_auth-1.28.0-py2.py3-none-any.whl", hash = "sha256:dcaba3aa9d4e0e96fd945bf25a86b6f878fcb05770b67adbeb50a63ca4d28a5e"}, ] google-auth-httplib2 = [ {file = "google-auth-httplib2-0.1.0.tar.gz", hash = "sha256:a07c39fd632becacd3f07718dfd6021bf396978f03ad3ce4321d060015cc30ac"}, @@ -1671,8 +1683,8 @@ googleapis-common-protos = [ {file = "googleapis_common_protos-1.53.0-py2.py3-none-any.whl", hash = "sha256:f6d561ab8fb16b30020b940e2dd01cd80082f4762fa9f3ee670f4419b4b8dbd0"}, ] httplib2 = [ - {file = "httplib2-0.19.0-py3-none-any.whl", hash = "sha256:749c32603f9bf16c1277f59531d502e8f1c2ca19901ae653b49c4ed698f0820e"}, - {file = "httplib2-0.19.0.tar.gz", hash = "sha256:e0d428dad43c72dbce7d163b7753ffc7a39c097e6788ef10f4198db69b92f08e"}, + {file = "httplib2-0.19.1-py3-none-any.whl", hash = "sha256:2ad195faf9faf079723f6714926e9a9061f694d07724b846658ce08d40f522b4"}, + {file = "httplib2-0.19.1.tar.gz", hash = "sha256:0b12617eeca7433d4c396a100eaecfa4b08ee99aa881e6df6e257a7aad5d533d"}, ] idna = [ {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, @@ -1683,16 +1695,16 @@ imagesize = [ {file = "imagesize-1.2.0.tar.gz", hash = "sha256:b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1"}, ] importlib-metadata = [ - {file = "importlib_metadata-3.7.2-py3-none-any.whl", hash = "sha256:407d13f55dc6f2a844e62325d18ad7019a436c4bfcaee34cda35f2be6e7c3e34"}, - {file = "importlib_metadata-3.7.2.tar.gz", hash = "sha256:18d5ff601069f98d5d605b6a4b50c18a34811d655c55548adc833e687289acde"}, + {file = "importlib_metadata-3.10.0-py3-none-any.whl", hash = "sha256:d2d46ef77ffc85cbf7dac7e81dd663fde71c45326131bea8033b9bad42268ebe"}, + {file = "importlib_metadata-3.10.0.tar.gz", hash = "sha256:c9db46394197244adf2f0b08ec5bc3cf16757e9590b02af1fca085c16c0d600a"}, ] iniconfig = [ {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"}, ] isort = [ - {file = "isort-5.7.0-py3-none-any.whl", hash = "sha256:fff4f0c04e1825522ce6949973e83110a6e907750cd92d128b0d14aaaadbffdc"}, - {file = "isort-5.7.0.tar.gz", hash = "sha256:c729845434366216d320e936b8ad6f9d681aab72dc7cbc2d51bedc3582f3ad1e"}, + {file = "isort-5.8.0-py3-none-any.whl", hash = "sha256:2bb1680aad211e3c9944dbce1d4ba09a989f04e238296c87fe2139faa26d655d"}, + {file = "isort-5.8.0.tar.gz", hash = "sha256:0a943902919f65c5684ac4e0154b1ad4fac6dcaa5d9f3426b732f1c8b5419be6"}, ] jedi = [ {file = "jedi-0.13.3-py2.py3-none-any.whl", hash = "sha256:2c6bcd9545c7d6440951b12b44d373479bf18123a401a52025cf98563fbd826c"}, @@ -1719,30 +1731,28 @@ keyring = [ {file = "keyring-22.4.0.tar.gz", hash = "sha256:d981e02d134cc3d636a716fbc3ca967bc9609bae5dc21b0063e4409355993ddf"}, ] lazy-object-proxy = [ - {file = "lazy-object-proxy-1.5.2.tar.gz", hash = "sha256:5944a9b95e97de1980c65f03b79b356f30a43de48682b8bdd90aa5089f0ec1f4"}, - {file = "lazy_object_proxy-1.5.2-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:e960e8be509e8d6d618300a6c189555c24efde63e85acaf0b14b2cd1ac743315"}, - {file = "lazy_object_proxy-1.5.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:522b7c94b524389f4a4094c4bf04c2b02228454ddd17c1a9b2801fac1d754871"}, - {file = "lazy_object_proxy-1.5.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:3782931963dc89e0e9a0ae4348b44762e868ea280e4f8c233b537852a8996ab9"}, - {file = "lazy_object_proxy-1.5.2-cp35-cp35m-manylinux2014_aarch64.whl", hash = "sha256:429c4d1862f3fc37cd56304d880f2eae5bd0da83bdef889f3bd66458aac49128"}, - {file = "lazy_object_proxy-1.5.2-cp35-cp35m-win32.whl", hash = "sha256:cd1bdace1a8762534e9a36c073cd54e97d517a17d69a17985961265be6d22847"}, - {file = "lazy_object_proxy-1.5.2-cp35-cp35m-win_amd64.whl", hash = "sha256:ddbdcd10eb999d7ab292677f588b658372aadb9a52790f82484a37127a390108"}, - {file = "lazy_object_proxy-1.5.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:ecb5dd5990cec6e7f5c9c1124a37cb2c710c6d69b0c1a5c4aa4b35eba0ada068"}, - {file = "lazy_object_proxy-1.5.2-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:b6577f15d5516d7d209c1a8cde23062c0f10625f19e8dc9fb59268859778d7d7"}, - {file = "lazy_object_proxy-1.5.2-cp36-cp36m-win32.whl", hash = "sha256:c8fe2d6ff0ff583784039d0255ea7da076efd08507f2be6f68583b0da32e3afb"}, - {file = "lazy_object_proxy-1.5.2-cp36-cp36m-win_amd64.whl", hash = "sha256:fa5b2dee0e231fa4ad117be114251bdfe6afe39213bd629d43deb117b6a6c40a"}, - {file = "lazy_object_proxy-1.5.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:1d33d6f789697f401b75ce08e73b1de567b947740f768376631079290118ad39"}, - {file = "lazy_object_proxy-1.5.2-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:57fb5c5504ddd45ed420b5b6461a78f58cbb0c1b0cbd9cd5a43ad30a4a3ee4d0"}, - {file = "lazy_object_proxy-1.5.2-cp37-cp37m-win32.whl", hash = "sha256:e7273c64bccfd9310e9601b8f4511d84730239516bada26a0c9846c9697617ef"}, - {file = "lazy_object_proxy-1.5.2-cp37-cp37m-win_amd64.whl", hash = "sha256:6f4e5e68b7af950ed7fdb594b3f19a0014a3ace0fedb86acb896e140ffb24302"}, - {file = "lazy_object_proxy-1.5.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:cadfa2c2cf54d35d13dc8d231253b7985b97d629ab9ca6e7d672c35539d38163"}, - {file = "lazy_object_proxy-1.5.2-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:e7428977763150b4cf83255625a80a23dfdc94d43be7791ce90799d446b4e26f"}, - {file = "lazy_object_proxy-1.5.2-cp38-cp38-win32.whl", hash = "sha256:2f2de8f8ac0be3e40d17730e0600619d35c78c13a099ea91ef7fb4ad944ce694"}, - {file = "lazy_object_proxy-1.5.2-cp38-cp38-win_amd64.whl", hash = "sha256:38c3865bd220bd983fcaa9aa11462619e84a71233bafd9c880f7b1cb753ca7fa"}, - {file = "lazy_object_proxy-1.5.2-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:8a44e9901c0555f95ac401377032f6e6af66d8fc1fbfad77a7a8b1a826e0b93c"}, - {file = "lazy_object_proxy-1.5.2-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:fa7fb7973c622b9e725bee1db569d2c2ee64d2f9a089201c5e8185d482c7352d"}, - {file = "lazy_object_proxy-1.5.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:71a1ef23f22fa8437974b2d60fedb947c99a957ad625f83f43fd3de70f77f458"}, - {file = "lazy_object_proxy-1.5.2-cp39-cp39-win32.whl", hash = "sha256:ef3f5e288aa57b73b034ce9c1f1ac753d968f9069cd0742d1d69c698a0167166"}, - {file = "lazy_object_proxy-1.5.2-cp39-cp39-win_amd64.whl", hash = "sha256:37d9c34b96cca6787fe014aeb651217944a967a5b165e2cacb6b858d2997ab84"}, + {file = "lazy-object-proxy-1.6.0.tar.gz", hash = "sha256:489000d368377571c6f982fba6497f2aa13c6d1facc40660963da62f5c379726"}, + {file = "lazy_object_proxy-1.6.0-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:c6938967f8528b3668622a9ed3b31d145fab161a32f5891ea7b84f6b790be05b"}, + {file = "lazy_object_proxy-1.6.0-cp27-cp27m-win32.whl", hash = "sha256:ebfd274dcd5133e0afae738e6d9da4323c3eb021b3e13052d8cbd0e457b1256e"}, + {file = "lazy_object_proxy-1.6.0-cp27-cp27m-win_amd64.whl", hash = "sha256:ed361bb83436f117f9917d282a456f9e5009ea12fd6de8742d1a4752c3017e93"}, + {file = "lazy_object_proxy-1.6.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d900d949b707778696fdf01036f58c9876a0d8bfe116e8d220cfd4b15f14e741"}, + {file = "lazy_object_proxy-1.6.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:5743a5ab42ae40caa8421b320ebf3a998f89c85cdc8376d6b2e00bd12bd1b587"}, + {file = "lazy_object_proxy-1.6.0-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:bf34e368e8dd976423396555078def5cfc3039ebc6fc06d1ae2c5a65eebbcde4"}, + {file = "lazy_object_proxy-1.6.0-cp36-cp36m-win32.whl", hash = "sha256:b579f8acbf2bdd9ea200b1d5dea36abd93cabf56cf626ab9c744a432e15c815f"}, + {file = "lazy_object_proxy-1.6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:4f60460e9f1eb632584c9685bccea152f4ac2130e299784dbaf9fae9f49891b3"}, + {file = "lazy_object_proxy-1.6.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:d7124f52f3bd259f510651450e18e0fd081ed82f3c08541dffc7b94b883aa981"}, + {file = "lazy_object_proxy-1.6.0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:22ddd618cefe54305df49e4c069fa65715be4ad0e78e8d252a33debf00f6ede2"}, + {file = "lazy_object_proxy-1.6.0-cp37-cp37m-win32.whl", hash = "sha256:9d397bf41caad3f489e10774667310d73cb9c4258e9aed94b9ec734b34b495fd"}, + {file = "lazy_object_proxy-1.6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:24a5045889cc2729033b3e604d496c2b6f588c754f7a62027ad4437a7ecc4837"}, + {file = "lazy_object_proxy-1.6.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:17e0967ba374fc24141738c69736da90e94419338fd4c7c7bef01ee26b339653"}, + {file = "lazy_object_proxy-1.6.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:410283732af311b51b837894fa2f24f2c0039aa7f220135192b38fcc42bd43d3"}, + {file = "lazy_object_proxy-1.6.0-cp38-cp38-win32.whl", hash = "sha256:85fb7608121fd5621cc4377a8961d0b32ccf84a7285b4f1d21988b2eae2868e8"}, + {file = "lazy_object_proxy-1.6.0-cp38-cp38-win_amd64.whl", hash = "sha256:d1c2676e3d840852a2de7c7d5d76407c772927addff8d742b9808fe0afccebdf"}, + {file = "lazy_object_proxy-1.6.0-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:b865b01a2e7f96db0c5d12cfea590f98d8c5ba64ad222300d93ce6ff9138bcad"}, + {file = "lazy_object_proxy-1.6.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:4732c765372bd78a2d6b2150a6e99d00a78ec963375f236979c0626b97ed8e43"}, + {file = "lazy_object_proxy-1.6.0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:9698110e36e2df951c7c36b6729e96429c9c32b3331989ef19976592c5f3c77a"}, + {file = "lazy_object_proxy-1.6.0-cp39-cp39-win32.whl", hash = "sha256:1fee665d2638491f4d6e55bd483e15ef21f6c8c2095f235fef72601021e64f61"}, + {file = "lazy_object_proxy-1.6.0-cp39-cp39-win_amd64.whl", hash = "sha256:f5144c75445ae3ca2057faac03fda5a902eff196702b0a24daf1d6ce0650514b"}, ] log4mongo = [ {file = "log4mongo-1.7.0.tar.gz", hash = "sha256:dc374617206162a0b14167fbb5feac01dbef587539a235dadba6200362984a68"}, @@ -1850,73 +1860,73 @@ packaging = [ {file = "packaging-20.9.tar.gz", hash = "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"}, ] parso = [ - {file = "parso-0.8.1-py2.py3-none-any.whl", hash = "sha256:15b00182f472319383252c18d5913b69269590616c947747bc50bf4ac768f410"}, - {file = "parso-0.8.1.tar.gz", hash = "sha256:8519430ad07087d4c997fda3a7918f7cfa27cb58972a8c89c2a0295a1c940e9e"}, + {file = "parso-0.8.2-py2.py3-none-any.whl", hash = "sha256:a8c4922db71e4fdb90e0d0bc6e50f9b273d3397925e5e60a717e719201778d22"}, + {file = "parso-0.8.2.tar.gz", hash = "sha256:12b83492c6239ce32ff5eed6d3639d6a536170723c6f3f1506869f1ace413398"}, ] pathlib2 = [ {file = "pathlib2-2.3.5-py2.py3-none-any.whl", hash = "sha256:0ec8205a157c80d7acc301c0b18fbd5d44fe655968f5d947b6ecef5290fc35db"}, {file = "pathlib2-2.3.5.tar.gz", hash = "sha256:6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868"}, ] pillow = [ - {file = "Pillow-8.1.2-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:5cf03b9534aca63b192856aa601c68d0764810857786ea5da652581f3a44c2b0"}, - {file = "Pillow-8.1.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:f91b50ad88048d795c0ad004abbe1390aa1882073b1dca10bfd55d0b8cf18ec5"}, - {file = "Pillow-8.1.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:5762ebb4436f46b566fc6351d67a9b5386b5e5de4e58fdaa18a1c83e0e20f1a8"}, - {file = "Pillow-8.1.2-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:e2cd8ac157c1e5ae88b6dd790648ee5d2777e76f1e5c7d184eaddb2938594f34"}, - {file = "Pillow-8.1.2-cp36-cp36m-win32.whl", hash = "sha256:72027ebf682abc9bafd93b43edc44279f641e8996fb2945104471419113cfc71"}, - {file = "Pillow-8.1.2-cp36-cp36m-win_amd64.whl", hash = "sha256:d1d6bca39bb6dd94fba23cdb3eeaea5e30c7717c5343004d900e2a63b132c341"}, - {file = "Pillow-8.1.2-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:90882c6f084ef68b71bba190209a734bf90abb82ab5e8f64444c71d5974008c6"}, - {file = "Pillow-8.1.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:89e4c757a91b8c55d97c91fa09c69b3677c227b942fa749e9a66eef602f59c28"}, - {file = "Pillow-8.1.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:8c4e32218c764bc27fe49b7328195579581aa419920edcc321c4cb877c65258d"}, - {file = "Pillow-8.1.2-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:a01da2c266d9868c4f91a9c6faf47a251f23b9a862dce81d2ff583135206f5be"}, - {file = "Pillow-8.1.2-cp37-cp37m-win32.whl", hash = "sha256:30d33a1a6400132e6f521640dd3f64578ac9bfb79a619416d7e8802b4ce1dd55"}, - {file = "Pillow-8.1.2-cp37-cp37m-win_amd64.whl", hash = "sha256:71b01ee69e7df527439d7752a2ce8fb89e19a32df484a308eca3e81f673d3a03"}, - {file = "Pillow-8.1.2-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:5a2d957eb4aba9d48170b8fe6538ec1fbc2119ffe6373782c03d8acad3323f2e"}, - {file = "Pillow-8.1.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:87f42c976f91ca2fc21a3293e25bd3cd895918597db1b95b93cbd949f7d019ce"}, - {file = "Pillow-8.1.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:15306d71a1e96d7e271fd2a0737038b5a92ca2978d2e38b6ced7966583e3d5af"}, - {file = "Pillow-8.1.2-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:71f31ee4df3d5e0b366dd362007740106d3210fb6a56ec4b581a5324ba254f06"}, - {file = "Pillow-8.1.2-cp38-cp38-win32.whl", hash = "sha256:98afcac3205d31ab6a10c5006b0cf040d0026a68ec051edd3517b776c1d78b09"}, - {file = "Pillow-8.1.2-cp38-cp38-win_amd64.whl", hash = "sha256:328240f7dddf77783e72d5ed79899a6b48bc6681f8d1f6001f55933cb4905060"}, - {file = "Pillow-8.1.2-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:bead24c0ae3f1f6afcb915a057943ccf65fc755d11a1410a909c1fefb6c06ad1"}, - {file = "Pillow-8.1.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:81b3716cc9744ffdf76b39afb6247eae754186838cedad0b0ac63b2571253fe6"}, - {file = "Pillow-8.1.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:63cd413ac52ee3f67057223d363f4f82ce966e64906aea046daf46695e3c8238"}, - {file = "Pillow-8.1.2-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:8565355a29655b28fdc2c666fd9a3890fe5edc6639d128814fafecfae2d70910"}, - {file = "Pillow-8.1.2-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:1940fc4d361f9cc7e558d6f56ff38d7351b53052fd7911f4b60cd7bc091ea3b1"}, - {file = "Pillow-8.1.2-cp39-cp39-win32.whl", hash = "sha256:46c2bcf8e1e75d154e78417b3e3c64e96def738c2a25435e74909e127a8cba5e"}, - {file = "Pillow-8.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:aeab4cd016e11e7aa5cfc49dcff8e51561fa64818a0be86efa82c7038e9369d0"}, - {file = "Pillow-8.1.2-pp36-pypy36_pp73-macosx_10_10_x86_64.whl", hash = "sha256:74cd9aa648ed6dd25e572453eb09b08817a1e3d9f8d1bd4d8403d99e42ea790b"}, - {file = "Pillow-8.1.2-pp36-pypy36_pp73-manylinux2010_i686.whl", hash = "sha256:e5739ae63636a52b706a0facec77b2b58e485637e1638202556156e424a02dc2"}, - {file = "Pillow-8.1.2-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:903293320efe2466c1ab3509a33d6b866dc850cfd0c5d9cc92632014cec185fb"}, - {file = "Pillow-8.1.2-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:5daba2b40782c1c5157a788ec4454067c6616f5a0c1b70e26ac326a880c2d328"}, - {file = "Pillow-8.1.2-pp37-pypy37_pp73-manylinux2010_i686.whl", hash = "sha256:1f93f2fe211f1ef75e6f589327f4d4f8545d5c8e826231b042b483d8383e8a7c"}, - {file = "Pillow-8.1.2-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:6efac40344d8f668b6c4533ae02a48d52fd852ef0654cc6f19f6ac146399c733"}, - {file = "Pillow-8.1.2-pp37-pypy37_pp73-win32.whl", hash = "sha256:f36c3ff63d6fc509ce599a2f5b0d0732189eed653420e7294c039d342c6e204a"}, - {file = "Pillow-8.1.2.tar.gz", hash = "sha256:b07c660e014852d98a00a91adfbe25033898a9d90a8f39beb2437d22a203fc44"}, + {file = "Pillow-8.2.0-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:dc38f57d8f20f06dd7c3161c59ca2c86893632623f33a42d592f097b00f720a9"}, + {file = "Pillow-8.2.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:a013cbe25d20c2e0c4e85a9daf438f85121a4d0344ddc76e33fd7e3965d9af4b"}, + {file = "Pillow-8.2.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:8bb1e155a74e1bfbacd84555ea62fa21c58e0b4e7e6b20e4447b8d07990ac78b"}, + {file = "Pillow-8.2.0-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:c5236606e8570542ed424849f7852a0ff0bce2c4c8d0ba05cc202a5a9c97dee9"}, + {file = "Pillow-8.2.0-cp36-cp36m-win32.whl", hash = "sha256:12e5e7471f9b637762453da74e390e56cc43e486a88289995c1f4c1dc0bfe727"}, + {file = "Pillow-8.2.0-cp36-cp36m-win_amd64.whl", hash = "sha256:5afe6b237a0b81bd54b53f835a153770802f164c5570bab5e005aad693dab87f"}, + {file = "Pillow-8.2.0-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:cb7a09e173903541fa888ba010c345893cd9fc1b5891aaf060f6ca77b6a3722d"}, + {file = "Pillow-8.2.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0d19d70ee7c2ba97631bae1e7d4725cdb2ecf238178096e8c82ee481e189168a"}, + {file = "Pillow-8.2.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:083781abd261bdabf090ad07bb69f8f5599943ddb539d64497ed021b2a67e5a9"}, + {file = "Pillow-8.2.0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:c6b39294464b03457f9064e98c124e09008b35a62e3189d3513e5148611c9388"}, + {file = "Pillow-8.2.0-cp37-cp37m-win32.whl", hash = "sha256:01425106e4e8cee195a411f729cff2a7d61813b0b11737c12bd5991f5f14bcd5"}, + {file = "Pillow-8.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:3b570f84a6161cf8865c4e08adf629441f56e32f180f7aa4ccbd2e0a5a02cba2"}, + {file = "Pillow-8.2.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:031a6c88c77d08aab84fecc05c3cde8414cd6f8406f4d2b16fed1e97634cc8a4"}, + {file = "Pillow-8.2.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:66cc56579fd91f517290ab02c51e3a80f581aba45fd924fcdee01fa06e635812"}, + {file = "Pillow-8.2.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6c32cc3145928c4305d142ebec682419a6c0a8ce9e33db900027ddca1ec39178"}, + {file = "Pillow-8.2.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:624b977355cde8b065f6d51b98497d6cd5fbdd4f36405f7a8790e3376125e2bb"}, + {file = "Pillow-8.2.0-cp38-cp38-win32.whl", hash = "sha256:5cbf3e3b1014dddc45496e8cf38b9f099c95a326275885199f427825c6522232"}, + {file = "Pillow-8.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:463822e2f0d81459e113372a168f2ff59723e78528f91f0bd25680ac185cf797"}, + {file = "Pillow-8.2.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:95d5ef984eff897850f3a83883363da64aae1000e79cb3c321915468e8c6add5"}, + {file = "Pillow-8.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b91c36492a4bbb1ee855b7d16fe51379e5f96b85692dc8210831fbb24c43e484"}, + {file = "Pillow-8.2.0-cp39-cp39-manylinux1_i686.whl", hash = "sha256:d68cb92c408261f806b15923834203f024110a2e2872ecb0bd2a110f89d3c602"}, + {file = "Pillow-8.2.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f217c3954ce5fd88303fc0c317af55d5e0204106d86dea17eb8205700d47dec2"}, + {file = "Pillow-8.2.0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:5b70110acb39f3aff6b74cf09bb4169b167e2660dabc304c1e25b6555fa781ef"}, + {file = "Pillow-8.2.0-cp39-cp39-win32.whl", hash = "sha256:a7d5e9fad90eff8f6f6106d3b98b553a88b6f976e51fce287192a5d2d5363713"}, + {file = "Pillow-8.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:238c197fc275b475e87c1453b05b467d2d02c2915fdfdd4af126145ff2e4610c"}, + {file = "Pillow-8.2.0-pp36-pypy36_pp73-macosx_10_10_x86_64.whl", hash = "sha256:0e04d61f0064b545b989126197930807c86bcbd4534d39168f4aa5fda39bb8f9"}, + {file = "Pillow-8.2.0-pp36-pypy36_pp73-manylinux2010_i686.whl", hash = "sha256:63728564c1410d99e6d1ae8e3b810fe012bc440952168af0a2877e8ff5ab96b9"}, + {file = "Pillow-8.2.0-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:c03c07ed32c5324939b19e36ae5f75c660c81461e312a41aea30acdd46f93a7c"}, + {file = "Pillow-8.2.0-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:4d98abdd6b1e3bf1a1cbb14c3895226816e666749ac040c4e2554231068c639b"}, + {file = "Pillow-8.2.0-pp37-pypy37_pp73-manylinux2010_i686.whl", hash = "sha256:aac00e4bc94d1b7813fe882c28990c1bc2f9d0e1aa765a5f2b516e8a6a16a9e4"}, + {file = "Pillow-8.2.0-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:22fd0f42ad15dfdde6c581347eaa4adb9a6fc4b865f90b23378aa7914895e120"}, + {file = "Pillow-8.2.0-pp37-pypy37_pp73-win32.whl", hash = "sha256:e98eca29a05913e82177b3ba3d198b1728e164869c613d76d0de4bde6768a50e"}, + {file = "Pillow-8.2.0.tar.gz", hash = "sha256:a787ab10d7bb5494e5f76536ac460741788f1fbce851068d73a87ca7c35fc3e1"}, ] pluggy = [ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"}, ] protobuf = [ - {file = "protobuf-3.15.6-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:1771ef20e88759c4d81db213e89b7a1fc53937968e12af6603c658ee4bcbfa38"}, - {file = "protobuf-3.15.6-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:1a66261a402d05c8ad8c1fde8631837307bf8d7e7740a4f3941fc3277c2e1528"}, - {file = "protobuf-3.15.6-cp35-cp35m-macosx_10_9_intel.whl", hash = "sha256:eac23a3e56175b710f3da9a9e8e2aa571891fbec60e0c5a06db1c7b1613b5cfd"}, - {file = "protobuf-3.15.6-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:9ec220d90eda8bb7a7a1434a8aed4fe26d7e648c1a051c2885f3f5725b6aa71a"}, - {file = "protobuf-3.15.6-cp35-cp35m-win32.whl", hash = "sha256:88d8f21d1ac205eedb6dea943f8204ed08201b081dba2a966ab5612788b9bb1e"}, - {file = "protobuf-3.15.6-cp35-cp35m-win_amd64.whl", hash = "sha256:eaada29bbf087dea7d8bce4d1d604fc768749e8809e9c295922accd7c8fce4d5"}, - {file = "protobuf-3.15.6-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:256c0b2e338c1f3228d3280707606fe5531fde85ab9d704cde6fdeb55112531f"}, - {file = "protobuf-3.15.6-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:b9069e45b6e78412fba4a314ea38b4a478686060acf470d2b131b3a2c50484ec"}, - {file = "protobuf-3.15.6-cp36-cp36m-win32.whl", hash = "sha256:24f4697f57b8520c897a401b7f9a5ae45c369e22c572e305dfaf8053ecb49687"}, - {file = "protobuf-3.15.6-cp36-cp36m-win_amd64.whl", hash = "sha256:d9ed0955b794f1e5f367e27f8a8ff25501eabe34573f003f06639c366ca75f73"}, - {file = "protobuf-3.15.6-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:822ac7f87fc2fb9b24edd2db390538b60ef50256e421ca30d65250fad5a3d477"}, - {file = "protobuf-3.15.6-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:74ac159989e2b02d761188a2b6f4601ff5e494d9b9d863f5ad6e98e5e0c54328"}, - {file = "protobuf-3.15.6-cp37-cp37m-win32.whl", hash = "sha256:30fe4249a364576f9594180589c3f9c4771952014b5f77f0372923fc7bafbbe2"}, - {file = "protobuf-3.15.6-cp37-cp37m-win_amd64.whl", hash = "sha256:45a91fc6f9aa86d3effdeda6751882b02de628519ba06d7160daffde0c889ff8"}, - {file = "protobuf-3.15.6-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:83c7c7534f050cb25383bb817159416601d1cc46c40bc5e851ec8bbddfc34a2f"}, - {file = "protobuf-3.15.6-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9ec20a6ded7d0888e767ad029dbb126e604e18db744ac0a428cf746e040ccecd"}, - {file = "protobuf-3.15.6-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:0f2da2fcc4102b6c3b57f03c9d8d5e37c63f8bc74deaa6cb54e0cc4524a77247"}, - {file = "protobuf-3.15.6-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:70054ae1ce5dea7dec7357db931fcf487f40ea45b02cb719ee6af07eb1e906fb"}, - {file = "protobuf-3.15.6-py2.py3-none-any.whl", hash = "sha256:1655fc0ba7402560d749de13edbfca1ac45d1753d8f4e5292989f18f5a00c215"}, - {file = "protobuf-3.15.6.tar.gz", hash = "sha256:2b974519a2ae83aa1e31cff9018c70bbe0e303a46a598f982943c49ae1d4fcd3"}, + {file = "protobuf-3.15.7-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:a14141d5c967362d2eedff8825d2b69cc36a5b3ed6b1f618557a04e58a3cf787"}, + {file = "protobuf-3.15.7-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d54d78f621852ec4fdd1484d1263ca04d4bf5ffdf7abffdbb939e444b6ff3385"}, + {file = "protobuf-3.15.7-cp35-cp35m-macosx_10_9_intel.whl", hash = "sha256:462085acdb410b06335315fe7e63cb281a1902856e0f4657f341c283cedc1d56"}, + {file = "protobuf-3.15.7-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:849c92ce112e1ef648705c29ce044248e350f71d9d54a2026830623198f0bd38"}, + {file = "protobuf-3.15.7-cp35-cp35m-win32.whl", hash = "sha256:1f6083382f7714700deadf3014e921711e2f807de7f27e40c32b744701ae5b99"}, + {file = "protobuf-3.15.7-cp35-cp35m-win_amd64.whl", hash = "sha256:e17f60f00081adcb32068ee0bb51e418f6474acf83424244ff3512ffd2166385"}, + {file = "protobuf-3.15.7-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6c75e563c6fb2ca5b8f21dd75c15659aa2c4a0025b9da3a7711ae661cd6a488d"}, + {file = "protobuf-3.15.7-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:d939f41b4108350841c4790ebbadb61729e1363522fdb8434eb4e6f2065d0db1"}, + {file = "protobuf-3.15.7-cp36-cp36m-win32.whl", hash = "sha256:24f14c09d4c0a3641f1b0e9b552d026361de65b01686fdd3e5fdf8f9512cd79b"}, + {file = "protobuf-3.15.7-cp36-cp36m-win_amd64.whl", hash = "sha256:1247170191bcb2a8d978d11a58afe391004ec6c2184e4d961baf8102d43ff500"}, + {file = "protobuf-3.15.7-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:364cadaeec0756afdc099cbd88cb5659bd1bb7d547168d063abcb0272ccbb2f6"}, + {file = "protobuf-3.15.7-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:0c3a6941b1e6e6e22d812a8e5c46bfe83082ea60d262a46f2cfb22d9b9fb17db"}, + {file = "protobuf-3.15.7-cp37-cp37m-win32.whl", hash = "sha256:eb5668f3f6a83b6603ca2e09be5b20de89521ea5914aabe032cce981e4129cc8"}, + {file = "protobuf-3.15.7-cp37-cp37m-win_amd64.whl", hash = "sha256:1001e671cf8476edce7fb72778358d026390649cc35a79d47b2a291684ccfbb2"}, + {file = "protobuf-3.15.7-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a5ba7dd6f97964655aa7b234c95d80886425a31b7010764f042cdeb985314d18"}, + {file = "protobuf-3.15.7-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:46674bd6fcf8c63b4b9869ba579685db67cf51ae966443dd6bd9a8fa00fcef62"}, + {file = "protobuf-3.15.7-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4c4399156fb27e3768313b7a59352c861a893252bda6fb9f3643beb3ebb7047e"}, + {file = "protobuf-3.15.7-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:85cd29faf056036167d87445d5a5059034c298881c044e71a73d3b61a4be1c23"}, + {file = "protobuf-3.15.7-py2.py3-none-any.whl", hash = "sha256:22054432b923c0086f9cf1e1c0c52d39bf3c6e31014ea42eec2dabc22ee26d78"}, + {file = "protobuf-3.15.7.tar.gz", hash = "sha256:2d03fc2591543cd2456d0b72230b50c4519546a8d379ac6fd3ecd84c6df61e5d"}, ] py = [ {file = "py-1.10.0-py2.py3-none-any.whl", hash = "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a"}, @@ -1960,8 +1970,8 @@ pyblish-base = [ {file = "pyblish_base-1.8.8-py2.py3-none-any.whl", hash = "sha256:67ea253a05d007ab4a175e44e778928ea7bdb0e9707573e1100417bbf0451a53"}, ] pycodestyle = [ - {file = "pycodestyle-2.6.0-py2.py3-none-any.whl", hash = "sha256:2295e7b2f6b5bd100585ebcb1f616591b652db8a741695b3d8f5d28bdc934367"}, - {file = "pycodestyle-2.6.0.tar.gz", hash = "sha256:c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e"}, + {file = "pycodestyle-2.7.0-py2.py3-none-any.whl", hash = "sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068"}, + {file = "pycodestyle-2.7.0.tar.gz", hash = "sha256:c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef"}, ] pycparser = [ {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"}, @@ -1973,16 +1983,16 @@ pydocstyle = [ {file = "pydocstyle-3.0.0.tar.gz", hash = "sha256:5741c85e408f9e0ddf873611085e819b809fca90b619f5fd7f34bd4959da3dd4"}, ] pyflakes = [ - {file = "pyflakes-2.2.0-py2.py3-none-any.whl", hash = "sha256:0d94e0e05a19e57a99444b6ddcf9a6eb2e5c68d3ca1e98e90707af8152c90a92"}, - {file = "pyflakes-2.2.0.tar.gz", hash = "sha256:35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8"}, + {file = "pyflakes-2.3.1-py2.py3-none-any.whl", hash = "sha256:7893783d01b8a89811dd72d7dfd4d84ff098e5eed95cfa8905b22bbffe52efc3"}, + {file = "pyflakes-2.3.1.tar.gz", hash = "sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db"}, ] pygments = [ {file = "Pygments-2.8.1-py3-none-any.whl", hash = "sha256:534ef71d539ae97d4c3a4cf7d6f110f214b0e687e92f9cb9d2a3b0d3101289c8"}, {file = "Pygments-2.8.1.tar.gz", hash = "sha256:2656e1a6edcdabf4275f9a3640db59fd5de107d88e8663c5d4e9a0fa62f77f94"}, ] pylint = [ - {file = "pylint-2.7.2-py3-none-any.whl", hash = "sha256:d09b0b07ba06bcdff463958f53f23df25e740ecd81895f7d2699ec04bbd8dc3b"}, - {file = "pylint-2.7.2.tar.gz", hash = "sha256:0e21d3b80b96740909d77206d741aa3ce0b06b41be375d92e1f3244a274c1f8a"}, + {file = "pylint-2.7.4-py3-none-any.whl", hash = "sha256:209d712ec870a0182df034ae19f347e725c1e615b2269519ab58a35b3fcbbe7a"}, + {file = "pylint-2.7.4.tar.gz", hash = "sha256:bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee"}, ] pymongo = [ {file = "pymongo-3.11.3-cp27-cp27m-macosx_10_14_intel.whl", hash = "sha256:4d959e929cec805c2bf391418b1121590b4e7d5cb00af7b1ba521443d45a0918"}, @@ -2123,8 +2133,8 @@ pyrsistent = [ {file = "pyrsistent-0.17.3.tar.gz", hash = "sha256:2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e"}, ] pytest = [ - {file = "pytest-6.2.2-py3-none-any.whl", hash = "sha256:b574b57423e818210672e07ca1fa90aaf194a4f63f3ab909a2c67ebb22913839"}, - {file = "pytest-6.2.2.tar.gz", hash = "sha256:9d1edf9e7d0b84d72ea3dbcdfd22b35fb543a5e8f2a60092dd578936bf63d7f9"}, + {file = "pytest-6.2.3-py3-none-any.whl", hash = "sha256:6ad9c7bdf517a808242b998ac20063c41532a570d088d77eec1ee12b0b5574bc"}, + {file = "pytest-6.2.3.tar.gz", hash = "sha256:671238a46e4df0f3498d1c3270e5deb9b32d25134c99b7d75370a68cfbe9b634"}, ] pytest-cov = [ {file = "pytest-cov-2.11.1.tar.gz", hash = "sha256:359952d9d39b9f822d9d29324483e7ba04a3a17dd7d05aa6beb7ea01e359e5f7"}, @@ -2198,8 +2208,8 @@ speedcopy = [ {file = "speedcopy-2.1.0.tar.gz", hash = "sha256:8bb1a6c735900b83901a7be84ba2175ed3887c13c6786f97dea48f2ea7d504c2"}, ] sphinx = [ - {file = "Sphinx-3.5.2-py3-none-any.whl", hash = "sha256:ef64a814576f46ec7de06adf11b433a0d6049be007fefe7fd0d183d28b581fac"}, - {file = "Sphinx-3.5.2.tar.gz", hash = "sha256:672cfcc24b6b69235c97c750cb190a44ecd72696b4452acaf75c2d9cc78ca5ff"}, + {file = "Sphinx-3.5.3-py3-none-any.whl", hash = "sha256:3f01732296465648da43dec8fb40dc451ba79eb3e2cc5c6d79005fd98197107d"}, + {file = "Sphinx-3.5.3.tar.gz", hash = "sha256:ce9c228456131bab09a3d7d10ae58474de562a6f79abb3dc811ae401cf8c1abc"}, ] sphinx-qt-documentation = [ {file = "sphinx_qt_documentation-0.3-py3-none-any.whl", hash = "sha256:bee247cb9e4fc03fc496d07adfdb943100e1103320c3e5e820e0cfa7c790d9b6"}, @@ -2245,8 +2255,8 @@ toml = [ {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, ] tqdm = [ - {file = "tqdm-4.59.0-py2.py3-none-any.whl", hash = "sha256:9fdf349068d047d4cfbe24862c425883af1db29bcddf4b0eeb2524f6fbdb23c7"}, - {file = "tqdm-4.59.0.tar.gz", hash = "sha256:d666ae29164da3e517fcf125e41d4fe96e5bb375cd87ff9763f6b38b5592fe33"}, + {file = "tqdm-4.60.0-py2.py3-none-any.whl", hash = "sha256:daec693491c52e9498632dfbe9ccfc4882a557f5fa08982db1b4d3adbe0887c3"}, + {file = "tqdm-4.60.0.tar.gz", hash = "sha256:ebdebdb95e3477ceea267decfc0784859aa3df3e27e22d23b83e9b272bf157ae"}, ] typed-ast = [ {file = "typed_ast-1.4.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:7703620125e4fb79b64aa52427ec192822e9f45d37d4b6625ab37ef403e1df70"}, @@ -2290,8 +2300,8 @@ uritemplate = [ {file = "uritemplate-3.0.1.tar.gz", hash = "sha256:5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae"}, ] urllib3 = [ - {file = "urllib3-1.26.3-py2.py3-none-any.whl", hash = "sha256:1b465e494e3e0d8939b50680403e3aedaa2bc434b7d5af64dfd3c958d7f5ae80"}, - {file = "urllib3-1.26.3.tar.gz", hash = "sha256:de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73"}, + {file = "urllib3-1.26.4-py2.py3-none-any.whl", hash = "sha256:2f4da4594db7e1e110a944bb1b551fdf4e6c136ad42e4234131391e21eb5b0df"}, + {file = "urllib3-1.26.4.tar.gz", hash = "sha256:e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937"}, ] wcwidth = [ {file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"}, @@ -2305,8 +2315,8 @@ wrapt = [ {file = "wrapt-1.12.1.tar.gz", hash = "sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7"}, ] wsrpc-aiohttp = [ - {file = "wsrpc-aiohttp-3.1.1.tar.gz", hash = "sha256:a17e1d91624a437e759d4f276b73de1db2071b1681e992cade025e91d31b2a9f"}, - {file = "wsrpc_aiohttp-3.1.1-py3-none-any.whl", hash = "sha256:f3f1ee31aed5145a7fafe8d6c778b914b7e6ec131500395c9c85b0d8676f7302"}, + {file = "wsrpc-aiohttp-3.1.2.tar.gz", hash = "sha256:891164dfe06a8d8d846b485d04b1e56b2c397ff1b46ef0348e6f62bd8efb1693"}, + {file = "wsrpc_aiohttp-3.1.2-py3-none-any.whl", hash = "sha256:4ba64e02b12dcbc09d02544f35bceba49bd04cbc496db47aa8559ae4609ada8e"}, ] yarl = [ {file = "yarl-1.6.3-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:0355a701b3998dcd832d0dc47cc5dedf3874f966ac7f870e0f3a6788d802d434"}, diff --git a/pyproject.toml b/pyproject.toml index ec2d9c7e3b..c8c0d5b4ff 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "OpenPype" -version = "3.0.0-alpha1" +version = "3.0.0-beta2" description = "Multi-platform open-source pipeline built around the Avalon platform, expanding it with extra features and integrations." authors = ["OpenPype Team "] license = "MIT License" @@ -18,6 +18,7 @@ acre = { git = "https://github.com/pypeclub/acre.git" } opentimelineio = { version = "0.14.0.dev1", source = "openpype" } appdirs = "^1.4.3" blessed = "^1.17" # openpype terminal formatting +coolname = "*" clique = "1.5.*" Click = "^7" dnspython = "^2.1.0" diff --git a/repos/avalon-core b/repos/avalon-core index bbba8765c4..911bd8999a 160000 --- a/repos/avalon-core +++ b/repos/avalon-core @@ -1 +1 @@ -Subproject commit bbba8765c431ee124590e4f12d2e56db4d62eacd +Subproject commit 911bd8999ab0030d0f7412dde6fd545c1a73b62d diff --git a/setup.cfg b/setup.cfg index 03c999e05f..51a3c1a9ca 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,7 +6,8 @@ exclude = .git, __pycache__, docs, - */vendor + */vendor, + website max-complexity = 30 diff --git a/start.py b/start.py index 1f946a705c..a2a03f112c 100644 --- a/start.py +++ b/start.py @@ -100,10 +100,20 @@ import subprocess import site from pathlib import Path -# add dependencies folder to sys.pat for frozen code -if getattr(sys, 'frozen', False): +# OPENPYPE_ROOT is variable pointing to build (or code) directory +# WARNING `OPENPYPE_ROOT` must be defined before igniter import +# - igniter changes cwd which cause that filepath of this script won't lead +# to right directory +if not getattr(sys, 'frozen', False): + # Code root defined by `start.py` directory + OPENPYPE_ROOT = os.path.dirname(os.path.abspath(__file__)) +else: + OPENPYPE_ROOT = os.path.dirname(sys.executable) + + # add dependencies folder to sys.pat for frozen code frozen_libs = os.path.normpath( - os.path.join(os.path.dirname(sys.executable), "dependencies")) + os.path.join(OPENPYPE_ROOT, "dependencies") + ) sys.path.append(frozen_libs) # add stuff from `/dependencies` to PYTHONPATH. pythonpath = os.getenv("PYTHONPATH", "") @@ -296,7 +306,7 @@ def _determine_mongodb() -> str: if not openpype_mongo: # try system keyring try: - openpype_mongo = bootstrap.registry.get_secure_item( + openpype_mongo = bootstrap.secure_registry.get_item( "openPypeMongo") except ValueError: print("*** No DB connection string specified.") @@ -305,7 +315,7 @@ def _determine_mongodb() -> str: igniter.open_dialog() try: - openpype_mongo = bootstrap.registry.get_secure_item( + openpype_mongo = bootstrap.secure_registry.get_item( "openPypeMongo") except ValueError: raise RuntimeError("missing mongodb url") @@ -316,22 +326,25 @@ def _determine_mongodb() -> str: def _initialize_environment(openpype_version: OpenPypeVersion) -> None: version_path = openpype_version.path os.environ["OPENPYPE_VERSION"] = openpype_version.version - # set OPENPYPE_ROOT to point to currently used OpenPype version. - os.environ["OPENPYPE_ROOT"] = os.path.normpath(version_path.as_posix()) + # set OPENPYPE_REPOS_ROOT to point to currently used OpenPype version. + os.environ["OPENPYPE_REPOS_ROOT"] = os.path.normpath( + version_path.as_posix() + ) # inject version to Python environment (sys.path, ...) print(">>> Injecting OpenPype version to running environment ...") bootstrap.add_paths_from_directory(version_path) - # Additional sys paths related to OPENPYPE_ROOT directory - # TODO move additional paths to `boot` part when OPENPYPE_ROOT will point - # to same hierarchy from code and from frozen OpenPype + # Additional sys paths related to OPENPYPE_REPOS_ROOT directory + # TODO move additional paths to `boot` part when OPENPYPE_REPOS_ROOT will + # point to same hierarchy from code and from frozen OpenPype additional_paths = [ + os.environ["OPENPYPE_REPOS_ROOT"], # add OpenPype tools - os.path.join(os.environ["OPENPYPE_ROOT"], "openpype", "tools"), + os.path.join(os.environ["OPENPYPE_REPOS_ROOT"], "openpype", "tools"), # add common OpenPype vendor # (common for multiple Python interpreter versions) os.path.join( - os.environ["OPENPYPE_ROOT"], + os.environ["OPENPYPE_REPOS_ROOT"], "openpype", "vendor", "python", @@ -352,7 +365,7 @@ def _find_frozen_openpype(use_version: str = None, """Find OpenPype to run from frozen code. This will process and modify environment variables: - ``PYTHONPATH``, ``OPENPYPE_VERSION``, ``OPENPYPE_ROOT`` + ``PYTHONPATH``, ``OPENPYPE_VERSION``, ``OPENPYPE_REPOS_ROOT`` Args: use_version (str, optional): Try to use specified version. @@ -464,16 +477,10 @@ def _bootstrap_from_code(use_version): # run through repos and add them to `sys.path` and `PYTHONPATH` # set root if getattr(sys, 'frozen', False): - openpype_root = os.path.normpath( - os.path.dirname(sys.executable)) - local_version = bootstrap.get_version(Path(openpype_root)) + local_version = bootstrap.get_version(Path(OPENPYPE_ROOT)) print(f" - running version: {local_version}") assert local_version else: - openpype_root = os.path.normpath( - os.path.dirname( - os.path.dirname( - os.path.realpath(igniter.__file__)))) # get current version of OpenPype local_version = bootstrap.get_local_live_version() @@ -487,15 +494,18 @@ def _bootstrap_from_code(use_version): bootstrap.add_paths_from_directory(version_path) os.environ["OPENPYPE_VERSION"] = use_version else: - version_path = openpype_root - os.environ["OPENPYPE_ROOT"] = openpype_root - repos = os.listdir(os.path.join(openpype_root, "repos")) - repos = [os.path.join(openpype_root, "repos", repo) for repo in repos] + version_path = OPENPYPE_ROOT + + repos = os.listdir(os.path.join(OPENPYPE_ROOT, "repos")) + repos = [os.path.join(OPENPYPE_ROOT, "repos", repo) for repo in repos] # add self to python paths - repos.insert(0, openpype_root) + repos.insert(0, OPENPYPE_ROOT) for repo in repos: sys.path.insert(0, repo) + # Set OPENPYPE_REPOS_ROOT to code root + os.environ["OPENPYPE_REPOS_ROOT"] = OPENPYPE_ROOT + # add venv 'site-packages' to PYTHONPATH python_path = os.getenv("PYTHONPATH", "") split_paths = python_path.split(os.pathsep) @@ -506,15 +516,15 @@ def _bootstrap_from_code(use_version): # in case when we are running without any version installed. if not getattr(sys, 'frozen', False): split_paths.append(site.getsitepackages()[-1]) - # TODO move additional paths to `boot` part when OPENPYPE_ROOT will point - # to same hierarchy from code and from frozen OpenPype + # TODO move additional paths to `boot` part when OPENPYPE_ROOT will + # point to same hierarchy from code and from frozen OpenPype additional_paths = [ # add OpenPype tools - os.path.join(os.environ["OPENPYPE_ROOT"], "openpype", "tools"), + os.path.join(OPENPYPE_ROOT, "openpype", "tools"), # add common OpenPype vendor # (common for multiple Python interpreter versions) os.path.join( - os.environ["OPENPYPE_ROOT"], + OPENPYPE_ROOT, "openpype", "vendor", "python", @@ -533,6 +543,11 @@ def _bootstrap_from_code(use_version): def boot(): """Bootstrap OpenPype.""" + # ------------------------------------------------------------------------ + # Set environment to OpenPype root path + # ------------------------------------------------------------------------ + os.environ["OPENPYPE_ROOT"] = OPENPYPE_ROOT + # ------------------------------------------------------------------------ # Play animation # ------------------------------------------------------------------------ @@ -563,16 +578,6 @@ def boot(): os.environ["OPENPYPE_MONGO"] = openpype_mongo os.environ["OPENPYPE_DATABASE_NAME"] = "openpype" # name of Pype database - # ------------------------------------------------------------------------ - # Set environments - load OpenPype path from database (if set) - # ------------------------------------------------------------------------ - # set OPENPYPE_ROOT to running location until proper version can be - # determined. - if getattr(sys, 'frozen', False): - os.environ["OPENPYPE_ROOT"] = os.path.dirname(sys.executable) - else: - os.environ["OPENPYPE_ROOT"] = os.path.dirname(__file__) - # Get openpype path from database and set it to environment so openpype can # find its versions there and bootstrap them. openpype_path = get_openpype_path_from_db(openpype_mongo) @@ -585,7 +590,7 @@ def boot(): # ------------------------------------------------------------------------ # Find OpenPype versions # ------------------------------------------------------------------------ - # WARNING: Environment OPENPYPE_ROOT may change if frozen OpenPype + # WARNING: Environment OPENPYPE_REPOS_ROOT may change if frozen OpenPype # is executed if getattr(sys, 'frozen', False): # find versions of OpenPype to be used with frozen code @@ -602,12 +607,6 @@ def boot(): # or to `openpype` or `openpype_console` in case of frozen code os.environ["OPENPYPE_EXECUTABLE"] = sys.executable - if getattr(sys, 'frozen', False): - os.environ["OPENPYPE_REPOS_ROOT"] = os.environ["OPENPYPE_ROOT"] - else: - os.environ["OPENPYPE_REPOS_ROOT"] = os.path.join( - os.environ["OPENPYPE_ROOT"], "repos") - # delete OpenPype module and it's submodules from cache so it is used from # specific version modules_to_del = [ @@ -677,7 +676,9 @@ def get_info() -> list: inf.append(("OpenPype variant", "staging")) else: inf.append(("OpenPype variant", "production")) - inf.append(("Running OpenPype from", os.environ.get('OPENPYPE_ROOT'))) + inf.append( + ("Running OpenPype from", os.environ.get('OPENPYPE_REPOS_ROOT')) + ) inf.append(("Using mongodb", components["host"])) if os.environ.get("FTRACK_SERVER"): diff --git a/tests/igniter/test_bootstrap_repos.py b/tests/igniter/test_bootstrap_repos.py index 75996b4026..6c70380ab6 100644 --- a/tests/igniter/test_bootstrap_repos.py +++ b/tests/igniter/test_bootstrap_repos.py @@ -11,7 +11,7 @@ import pytest from igniter.bootstrap_repos import BootstrapRepos from igniter.bootstrap_repos import PypeVersion -from pype.lib import PypeSettingsRegistry +from pype.lib import OpenPypeSettingsRegistry @pytest.fixture @@ -348,7 +348,7 @@ def test_find_pype(fix_bootstrap, tmp_path_factory, monkeypatch, printer): return d_path.as_posix() monkeypatch.setattr(appdirs, "user_data_dir", mock_user_data_dir) - fix_bootstrap.registry = PypeSettingsRegistry() + fix_bootstrap.registry = OpenPypeSettingsRegistry() fix_bootstrap.registry.set_item("pypePath", d_path.as_posix()) result = fix_bootstrap.find_pype(include_zips=True) diff --git a/tests/pype/lib/test_user_settings.py b/tests/pype/lib/test_user_settings.py index 7f0f400f59..02342abbc9 100644 --- a/tests/pype/lib/test_user_settings.py +++ b/tests/pype/lib/test_user_settings.py @@ -1,10 +1,20 @@ import pytest -from pype.lib import IniSettingRegistry -from pype.lib import JSONSettingRegistry +from pype.lib import ( + IniSettingRegistry, + JSONSettingRegistry, + OpenPypeSecureRegistry +) from uuid import uuid4 import configparser +@pytest.fixture +def secure_registry(tmpdir): + name = "pypetest_{}".format(str(uuid4())) + r = OpenPypeSecureRegistry(name, tmpdir) + yield r + + @pytest.fixture def json_registry(tmpdir): name = "pypetest_{}".format(str(uuid4())) @@ -19,21 +29,21 @@ def ini_registry(tmpdir): yield r -def test_keyring(json_registry): - json_registry.set_secure_item("item1", "foo") - json_registry.set_secure_item("item2", "bar") - result1 = json_registry.get_secure_item("item1") - result2 = json_registry.get_secure_item("item2") +def test_keyring(secure_registry): + secure_registry.set_item("item1", "foo") + secure_registry.set_item("item2", "bar") + result1 = secure_registry.get_item("item1") + result2 = secure_registry.get_item("item2") assert result1 == "foo" assert result2 == "bar" - json_registry.delete_secure_item("item1") - json_registry.delete_secure_item("item2") + secure_registry.delete_item("item1") + secure_registry.delete_item("item2") with pytest.raises(ValueError): - json_registry.get_secure_item("item1") - json_registry.get_secure_item("item2") + secure_registry.get_item("item1") + secure_registry.get_item("item2") def test_ini_registry(ini_registry): diff --git a/tools/build.ps1 b/tools/build.ps1 index a6c76dfafb..412bb111c1 100644 --- a/tools/build.ps1 +++ b/tools/build.ps1 @@ -157,11 +157,12 @@ Write-Host "Reading Poetry ... " -NoNewline if (-not (Test-Path -PathType Container -Path "$($env:USERPROFILE)\.poetry\bin")) { Write-Host "NOT FOUND" -ForegroundColor Yellow Install-Poetry + Write-Host "INSTALLED" -ForegroundColor Cyan } else { Write-Host "OK" -ForegroundColor Green } - +$env:PATH = "$($env:PATH);$($env:USERPROFILE)\.poetry\bin" Write-Host ">>> " -NoNewline -ForegroundColor green Write-Host "Cleaning cache files ... " -NoNewline @@ -172,6 +173,7 @@ Write-Host "OK" -ForegroundColor green Write-Host ">>> " -NoNewline -ForegroundColor green Write-Host "Building OpenPype ..." + $out = & poetry run python setup.py build 2>&1 if ($LASTEXITCODE -ne 0) { diff --git a/tools/create_env.sh b/tools/create_env.sh index 6ca0731963..7bdb8503fd 100755 --- a/tools/create_env.sh +++ b/tools/create_env.sh @@ -172,6 +172,7 @@ main () { poetry run python -m pip install --upgrade pip poetry run pip install --force-reinstall setuptools poetry run pip install --force-reinstall wheel + poetry run python -m pip install --force-reinstall pip } main -3 diff --git a/website/docs/admin_distribute.md b/website/docs/admin_distribute.md new file mode 100644 index 0000000000..b0ab71e2f3 --- /dev/null +++ b/website/docs/admin_distribute.md @@ -0,0 +1,50 @@ +--- +id: admin_distribute +title: Distribute +sidebar_label: Distribute +--- + +import Tabs from '@theme/Tabs'; +import TabItem from '@theme/TabItem'; + +To let your artists to use OpenPype, you'll need to distribute the frozen executables to them. + +Distribution consists of two parts + + ### 1. OpenPype Igniter + + This is the base application that will be installed locally on each workstation. + It is self contained (frozen) software that also includes all of the OpenPype codebase with the version + from the time of the build. + + Igniter package is around 500MB and preparing an updated version requires you to re-build pype. That would be + inconvenient for regular and quick distribution of production updates and fixes. So you can distribute those + independently, without requiring you artists to re-install every time. + + ### 2. OpenPype Codebase + +When you upgrade your studio pype deployment to a new version or make any local code changes, you can distribute +these changes to your artists, without the need of re-building OpenPype, by using `create_zip` tool provided. +The resulting zip needs to be made available to the artists and it will override their local OpenPype install +with the updated version. + +You have two ways of making this happen + +#### Automatic Updates + +Everytime and Artist launches OpenPype on their workstation, it will look to a pre-defined +[openPype update location](#self) for any versions that are newer than the +latest, locally installed version. If such version is found, it will be downloaded, +automatically extracted to the correct place and launched. This will become the default +version to run for the artist, until a higher version is detected in the update location again. + +#### Manual Updates + +If for some reason you don't want to use the automatic updates, you can distribute your +zips manually. Your artist will then have to unpack them to the correct place on their disk. + +The default locations are: + +- Windows: `C:\Users\%USERNAME%\AppData\Local\pypeclub\openpype` +- Linux: ` ` +- Mac: ` ` diff --git a/website/docs/admin_docsexamples.md b/website/docs/admin_docsexamples.md new file mode 100644 index 0000000000..6b4ae101d3 --- /dev/null +++ b/website/docs/admin_docsexamples.md @@ -0,0 +1,119 @@ +--- +id: admin_docsexamples +title: Examples of using notes +sidebar_label: docsexamples +--- + +import Tabs from '@theme/Tabs'; +import TabItem from '@theme/TabItem'; + + + + + +This is your mac stuff + + + + +This is your linux stuff + + + + + +This is your mac stuff + + + + + + + + + +:::note Name of the category + + + + + +This is your mac stuff + + + + +This is your linux stuff + + + + + +This is your mac stuff + + + + +::: + + +========================= + +:::important + +- This is my note +- another list +- super list + +```python +import os +print(os.environ) +``` + +::: + +:::tip +This is my note +::: + +:::note +This is my note +::: + +:::warning +This is my note +::: + +:::caution +This is my note +::: + +export const Highlight = ({children, color}) => ( + + {children} + +); + +Docusaurus green and Facebook blue are my favorite colors. + +I can write **Markdown** alongside my _JSX_! diff --git a/website/docs/admin_openpype_commands.md b/website/docs/admin_openpype_commands.md new file mode 100644 index 0000000000..6e187c3c8a --- /dev/null +++ b/website/docs/admin_openpype_commands.md @@ -0,0 +1,140 @@ +--- +id: admin_openpype_commands +title: OpenPype Commands Reference +sidebar_label: OpenPype Commands +--- + + +## `tray` + +To launch Tray: +```sh +pype tray +``` + +### `--debug` + +To launch Tray with debugging information: +```sh +pype tray --debug +``` + +-------------------- + + +## `eventserver` + +This command launches ftrack event server. + +This should be ideally used by system service (such us systemd or upstart +on linux and window service). + +You have to set either proper environment variables to provide URL and +credentials or use option to specify them. If you use `--store_credentials` +provided credentials will be stored for later use. + +To run ftrack event server: +```sh +pype eventserver --ftrack-url= --ftrack-user= --ftrack-api-key= --ftrack-events-path= --no-stored-credentials --store-credentials +``` + + +### `--debug` +- print debug info + +### `--ftrack-url` +- URL to ftrack server + +### `--ftrack-user` +- user name to log in to ftrack + +### `--ftrack-api-key` +- ftrack api key + +### `--ftrack-events-path` +- path to event server plugins + +### `--no-stored-credentials` +- will use credential specified with options above + +### `--store-credentials` +- will store credentials to file for later use + +-------------------- + +## `launch` + +Launch application in Pype environment. + +### `--app` + +Application name - this should be the same as it's [defining toml](admin_hosts#launchers) file (without .toml) + +### `--project` +Project name + +### `--asset` +Asset name + +### `--task` +Task name + +### `--tools` +*Optional: Additional tools environment files to add* + +### `--user` +*Optional: User on behalf to run* + +### `--ftrack-server` / `-fs` +*Optional: Ftrack server URL* + +### `--ftrack-user` / `-fu` +*Optional: Ftrack user* + +### `--ftrack-key` / `-fk` +*Optional: Ftrack API key* + +For example to run Python interactive console in Pype context: +```sh +pype launch --app python --project my_project --asset my_asset --task my_task +``` + +-------------------- + + +## `publish` + +Pype takes JSON from provided path and use it to publish data in it. +```sh +pype publish +``` + +### `--debug` +- print more verbose infomation + +-------------------- + +## `extractenvironments` + +Extract environment variables for entered context to a json file. + +Entered output filepath will be created if does not exists. + +All context options must be passed otherwise only openpype's global environments will be extracted. + +Context options are "project", "asset", "task", "app" + +### `output_json_path` +- Absolute path to the exported json file + +### `--project` +- Project name + +### `--asset` +- Asset name + +### `--task` +- Task name + +### `--app` +- Application name \ No newline at end of file diff --git a/website/docs/admin_settings.md b/website/docs/admin_settings.md new file mode 100644 index 0000000000..0cd10f81dc --- /dev/null +++ b/website/docs/admin_settings.md @@ -0,0 +1,86 @@ +--- +id: admin_settings +title: Working with settings +sidebar_label: Working with settings +--- + +import Tabs from '@theme/Tabs'; +import TabItem from '@theme/TabItem'; + +OpenPype stores all of it's settings and configuration in the mongo database. To make the configuration as easy as possible we provide a robust GUI where you can access and change everything that is configurable + +**Settings** GUI can be started from the tray menu. + +Please keep in mind that these settings are set-up for the full studio and not per-individual. If you're looking for individual artist settings, you can head to +[Local Settings](#local-settings) section in the artist documentation. + + +## Categories + +We use simple colour coding to show you any changes to the settings: +- **Grey**: [OpenPype default](#openpype-defaults) +- **Green**: [Studio default](#openpype-defaults) +- **Orange**: [Project Override](#project-overrides) +- **Blue**: Changed and unsaved value + +You'll find that settings are split into categories: + +### [System](admin_settings_system) + +System sections contains all settings that can be configured on a studio level, but cannot +be changed on a per-project basis. These include mostly high level options like path to +mongo database, toggling major modules on and off and configuring studio wide application +availability. + +### [Project](admin_settings_project) + +Project tab contains most of OpenPype settings and all of them can be configured and overriden on a per-project basis if need be. This includes most of the workflow behaviors +like what formats to export, naming conventions, publishing validations, automatic assets loaders and a lot more. + +We recommend to try to keep as many configurations as possible on a studio level and only override selectively, because micromanaging all of the project settings might become cumbersome down the line. Most of the settings can be safely adjusted and locked on a project +after the production started. + +## Understanding Overrides + +Most of the individual settings can be set and overriden on multiple levels. + +### OpenPype defaults +When you first open settings all of the values and categories will be marked with a +light **grey labels** or a **grey vertical bar** on the left edge of the expandable category. + +That means, the value has been left at OpenPype Default. If the default changes in future +OpenPype versions, these values will be reflect the change after you deploy the new version. + +### Studio defaults + +Any values that you change and then press save in the bottom right corner, will be saved +as studio defaults. This means they will stay at those values even if you update your pype. +To make it clear which settings are set by you specifically, they are marked with a **green +edge** and **green labels**, once set. + +To set studio default, just change the value in the system tab and press save. If you want +to keep the value but add the option to your studio default to protect it from potential +future updates, you ran `right click` and choose `add to studio default`, then press save. + +In the Project settings tab, you need to select the **( Default )** project on the left, to set your studio defaults for projects. The rest works the same as in the System tab. + +![studio_defaults](assets/settings/studio_defaults.gif) + +You can also reset any settings to OpenPype default by doing `right click` and `remove from studio default` + +![studio_defaults](assets/settings/studio_defaults_remove.gif) + +### Project Overrides + +Many settings are usefull to be adjusted on a per-project basis. To identify project +overrides, they are marked with **orange edge** and **orange labels** in the settings GUI. + +To set project overrides proceed the same way as with the Studio defaults, but first select +a particular project you want to be configuring on the left hand side of the Project Settings tab. + +Here you can see all three overrides at the same time. Deadline has not studio changes at all, Maya has some studio defaults configures and Nuke also contains project specific overrides. +![colours_01](assets/settings/colours_02.png) + +Override colours work as breadcrumbs to allow quick identification of what was changed and where. As you can see on this image, Orange colour is propagated up the hierarchy even though only a single value (sync render version with workfile toggle), was changed. + +![override_breadcumbs](assets/settings/override_breadcrumbs.png) diff --git a/website/docs/admin_settings_project.md b/website/docs/admin_settings_project.md new file mode 100644 index 0000000000..a30c0f0082 --- /dev/null +++ b/website/docs/admin_settings_project.md @@ -0,0 +1,11 @@ +--- +id: admin_settings_project +title: Project Settings +sidebar_label: Project Settings +--- + +import Tabs from '@theme/Tabs'; +import TabItem from '@theme/TabItem'; + + +PROJECT Settings \ No newline at end of file diff --git a/website/docs/admin_settings_project_anatomy.md b/website/docs/admin_settings_project_anatomy.md new file mode 100644 index 0000000000..54023d468f --- /dev/null +++ b/website/docs/admin_settings_project_anatomy.md @@ -0,0 +1,106 @@ +--- +id: admin_settings_project_anatomy +title: Project Anatomy +sidebar_label: Project Anatomy +--- + +import Tabs from '@theme/Tabs'; +import TabItem from '@theme/TabItem'; + + +Project Anatomy is the most important configuration piece for each project you work on with openPype. + +It defines: +- Project Root folders +- File naming conventions +- Folder structure templates +- Default project attributes +- Task Types +- Applications and Tool versions +- Colour Management +- File Formats + +Anatomy is the only configuration that is always saved as project override. This is to make sure, that any updates to OpenPype or Studio default values, don't affect currently running productions. + +![anatomy_01](assets/settings/anatomy_01.png) + +## Roots + +Roots define where files are stored with path to shared folder. It is required to set root path for each platform you are using in studio. All paths must point to same folder! + +![roots01](assets/settings/anatomy_roots01.png) + +It is possible to set multiple roots when necessary. That may be handy when you need to store specific type of data on another disk. +![roots02](assets/settings/anatomy_roots02.png) + + +Note how multiple roots are used here, to push different types of files to different shared storage. +![roots03](assets/settings/anatomy_roots03.png) + + +## Templates + +Templates define project's folder structure and filenames. + +We have a few required anatomy templates for OpenPype to work properly, however we keep adding more when needed. + +### Available template keys + +
+
+ + +| Context key | Description | +| --- | --- | +| `root[name]` | Path to root folder | +| `project[name]` | Project's full name | +| `project[code]` | Project's code | +| `hierarchy` | All hierarchical parents as subfolders | +| `asset` | Name of asset or shot | +| `task` | Name of task | +| `version` | Version number | +| `subset` | Subset name | +| `family` | Main family name | +| `ext` | File extention | +| `representation` | Representation name | +| `frame` | Frame number for sequence files. | +| `output` | | +| `comment` | | + +
+
+ +| Date-Time key | Example result | Description | +| --- | --- | --- | +| `d` | 1, 30 | Short day of month | +| `dd` | 01, 30 | Day of month with 2 digits. | +| `ddd` | Mon | Shortened week day name. | +| `dddd` | Monday | Full week day name. | +| `m` | 1, 12 | Short month number. | +| `mm` | 01, 12 | Month number with 2 digits. | +| `mmm` | Jan | Shortened month name. | +| `mmmm` | January | Full month name. | +| `yy` | 20 | Shortened year. | +| `yyyy` | 2020 | Full year. | +| `H` | 4, 17 | Shortened 24-hour number. | +| `HH` | 04, 17 | 24-hour number with 2 digits. | +| `h` | 5 | Shortened 12-hour number. | +| `hh` | 05 | 12-hour number with 2 digits. | +| `ht` | AM, PM | Midday part. | +| `M` | 0 | Shortened minutes number. | +| `MM` | 00 | Minutes number with 2 digits. | +| `S` | 0 | Shortened seconds number. | +| `SS` | 00 | Seconds number with 2 digits. | + +
+
+ + +## Attributes + + + +## Task Types + + +## Colour Management and Formats \ No newline at end of file diff --git a/website/docs/admin_settings_system.md b/website/docs/admin_settings_system.md new file mode 100644 index 0000000000..0c4a6c863d --- /dev/null +++ b/website/docs/admin_settings_system.md @@ -0,0 +1,132 @@ +--- +id: admin_settings_system +title: System Settings +sidebar_label: System settings +--- + +import Tabs from '@theme/Tabs'; +import TabItem from '@theme/TabItem'; + +## Global + +Settings applicable to the full studio. + +`Studio Name` + +`Studio Code` + +`Environment` + +## Modules + +Configuration of OpenPype modules. Some can only be turned on and off, others have +their own attributes that need to be set, before they become fully functional. + +### Avalon + +`Avalon Mongo Timeout` - You might need to change this if your mongo connection is a bit slow. Making the +timeout longer will give Avalon better chance to connect. + +`Thumbnail Storage Location` - simple disk storage path, where all thumbnails will be stored. + +### Ftrack + +`Server` - URL of your ftrack server. + +Additional Action paths + +`Action paths` - Directories containing your custom ftrack actions. + +`Event paths` - Directories containing your custom ftrack event plugins. + +`Intent` - Special ftrack attribute that mark the intention of individual publishes. This setting will be reflected +in publisher as well as ftrack custom attributes + +`Custom Attributes` - Write and Read permissions for all OpenPype required ftrack custom attributes. The values should be +ftrack roles names. + +### Sync Server + +Disable/Enable OpenPype site sync feature + +### Standalone Publisher + +Disable/Enable Standalone Publisher option + +### Deadline + +`Deadline Rest URL` - URL to deadline webservice that. This URL must be reachable from every +workstation that should be submitting render jobs to deadline via OpenPype. + +### Muster + +`Muster Rest URL` - URL to Muster webservice that. This URL must be reachable from every +workstation that should be submitting render jobs to muster via OpenPype. + +`templates mapping` - you can customize Muster templates to match your existing setup here. + +### Clockify + +`Workspace Name` - name of the clockify workspace where you would like to be sending all the timelogs. + +### Timers Manager + +`Max Idle Time` - Duration (minutes) of inactivity, after which currently running timer will be stopped. + +`Dialog popup time` - Time in minutes, before the end of Max Idle ti, when a notification will alert +the user that their timer is about to be stopped. + +### Idle Manager + +Service monitoring the activity, which triggers the Timers Manager timeouts. + +### Logging + +Module that allows storing all logging into the database for easier retrieval and support. + +## Applications + +In this section you can manage what Applications are available to your studio, locations of their +executables and their additional environments. + +Each DCC is made of two levels. +1. **Application group** - This is the main name of the application and you can define extra environments +that are applicable to all version of the give application. For example any extra Maya scripts that are not +version dependant, can be added to `Maya` environment here. +2. **Application versions** - Here you can define executables (per platform) for each supported version of +the DCC and any default arguments (`--nukex` for instance). You can also further extend it's environment. + +![settings_applications](assets/settings/applications_01.png) + +Please keep in mind that the environments are not additive by default, so if you are extending variables like +`PYTHONPATH`, or `PATH` make sure that you add themselves to the end of the list. + +For instance: + +```json +{ + "PYTHONPATH": [ + "my/path/to/python/scripts", + "{PYTHONPATH}" + ] +} +``` + + + + +## Tools + +A tool in openPype is anything that needs to be selectively added to your DCC applications. Most often these are plugins, modules, extensions or similar depending on what your package happens to call it. + +OpenPype comes with some major CG renderers pre-configured as an example, but these and any others will need to be changed to match your particular environment. + +Their environment settings are split to two levels just like applications to allow more flexibility when setting them up. + +In the image before you can see that we set most of the environment variables in the general MTOA level, and only specify the version variable in the individual versions below. Because all environments within pype setting will resolve any cross references, this is enough to get a fully dynamic plugin loading as far as your folder structure where you store the plugins is nicely organized. + + +In this example MTOA will automatically will the `MAYA_VERSION`(which is set by Maya Application environment) and `MTOA_VERSION` into the `MTOA` variable. We then use the `MTOA` to set all the other variables needed for it to function within Maya. +![tools](assets/settings/tools_01.png) + +All of the tools defined in here can then be assigned to projects. You can also change the tools versions on any project level all the way down to individual asset or shot overrides. So if you just need to upgrade you render plugin for a single shot, while not risking the incompatibilities on the rest of the project, it is possible. \ No newline at end of file diff --git a/website/docs/admin_use.md b/website/docs/admin_use.md new file mode 100644 index 0000000000..376e9397a1 --- /dev/null +++ b/website/docs/admin_use.md @@ -0,0 +1,37 @@ +--- +id: admin_use +title: Install and Run +sidebar_label: Install & Run +--- + +import Tabs from '@theme/Tabs'; +import TabItem from '@theme/TabItem'; + + +## Install + +You can install OpenPype on individual workstations the same way as any other software. +When you create you build, you will end up with an installation package for the platform +that was used for the build. + +- Windows: `OpenPype-3.0.0.msi` +- Linux: `OpenPype-3.0.0.zip` +- Mac: `OpenPype-3.0.0.dmg` + +After OpenPype is installed, it will ask the user for further installation if it detects a +newer version in the studio update location. + +## Run OpenPype + +To use OpenPype on a workstation simply run the executable that was installed. +On the first run the user will be prompted to for OpenPype Mongo URL. +This piece of information needs to be provided to the artist by the admin setting +up OpenPype in the studio. + +Once artist enters the Mongo URL address, OpenPype will remember the connection for the +next launch, so it is a one time process.From that moment OpenPype will do it's best to +always keep up to date with the latest studio updates. + +If the launch was successfull, the artist should see a green OpenPype logo in their +tray menu. Keep in mind that on Windows this icon might be hidden by default, in which case, +the artist can simply drag the icon down to the tray. \ No newline at end of file diff --git a/website/docs/api.md b/website/docs/api.md new file mode 100644 index 0000000000..7cad92d603 --- /dev/null +++ b/website/docs/api.md @@ -0,0 +1,7 @@ +--- +id: api +title: Pype API +sidebar_label: API +--- + +Work in progress diff --git a/website/docs/artist_concepts.md b/website/docs/artist_concepts.md new file mode 100644 index 0000000000..6046ba6214 --- /dev/null +++ b/website/docs/artist_concepts.md @@ -0,0 +1,53 @@ +--- +id: artist_concepts +title: Key concepts +sidebar_label: Key Concepts +--- + +## Glossary + +### Asset + +In our pipeline all the main entities the project is made from are internally considered *'Assets'*. Episode, sequence, shot, character, prop, etc. All of these behave identically in the pipeline. Asset names need to be absolutely unique within the project because they are their key identifier. + +### Subset + +Usually, an asset needs to be created in multiple *'flavours'*. A character might have multiple different looks, model needs to be published in different resolutions, a standard animation rig might not be useable in a crowd system and so on. 'Subsets' are here to accommodate all this variety that might be needed within a single asset. A model might have subset: *'main'*, *'proxy'*, *'sculpt'*, while data of *'look'* family could have subsets *'main'*, *'dirty'*, *'damaged'*. Subsets have some recommendations for their names, but ultimately it's up to the artist to use them for separation of publishes when needed. + +### Version + +A numbered iteration of a given subset. Each version contains at least one [representation][daa74ebf]. + + [daa74ebf]: #representation "representation" + +### Representation + +Each published variant can come out of the software in multiple representations. All of them hold exactly the same data, but in different formats. A model, for example, might be saved as `.OBJ`, Alembic, Maya geometry or as all of them, to be ready for pickup in any other applications supporting these formats. + +### Family + +Each published [subset][3b89d8e0] can have exactly one family assigned to it. Family determines the type of data that the subset holds. Family doesn't dictate the file type, but can enforce certain technical specifications. For example OpenPype default configuration expects `model` family to only contain geometry without any shaders or joins when it is published. + + + [3b89d8e0]: #subset "subset" + + + +### Host + +General term for Software or Application supported by OpenPype and Avalon. These are usually DCC applications like Maya, Houdini or Nuke, but can also be a web based service like Ftrack or Clockify. + + +### Tool + +Small piece of software usually dedicated to a particular purpose. Most of OpenPype and Avalon tools have GUI, but some are command line only + + +### Publish + +Process of exporting data from your work scene to versioned, immutable file that can be used by other artists in the studio. + +### Load + +Process of importing previously published subsets into your current scene, using any of the OpenPype tools. +Loading asset using proper tools will ensure that all your scene content stays version controlled and updatable at a later point diff --git a/website/docs/artist_ftrack.md b/website/docs/artist_ftrack.md new file mode 100644 index 0000000000..2210615160 --- /dev/null +++ b/website/docs/artist_ftrack.md @@ -0,0 +1,134 @@ +--- +id: artist_ftrack +title: Ftrack +sidebar_label: Artist +--- + +# How to use Ftrack in OpenPype + +## Login to Ftrack module in OpenPype (best case scenario) +1. Launch OpenPype and go to systray OpenPype icon. +2. *Ftrack login* window pop up on start or press **login** in **Ftrack menu** to pop up *Ftrack login* window + + ![ftrack-login-2](assets/ftrack/ftrack-login_50.png) + + - Press `Ftrack` button + + ![Login widget](assets/ftrack/ftrack-login_1.png) + - Web browser opens + + - Sign into Ftrack if requested. If you are already signed in to Ftrack via web browser, you can jump to [Application launch](#application-launch-best-case-scenario) + + ![ftrack-login-2](assets/ftrack/ftrack-login_2.png) + +3. Message is shown + +![ftrack-login-3](assets/ftrack/ftrack-login_3.png) + +4. Close message and you're ready to use actions - continue with [Application launch](#application-launch-best-case-scenario) + + +--- + +## Application launch (best case scenario) +1. Make sure OpenPype is running and you passed [Login to Ftrack](#login-to-ftrack-module-in-openpype-best-case-scenario) guide + +2. Open Web browser and go to your studio Ftrack web page *(e.g. https://mystudio.ftrackapp.com/)* + +3. Locate the task to run the application on. + +4. Display actions for the task + ![ftrack-login-3](assets/ftrack/ftrack-login_60.png) + +5. Select application you want to launch + - application versions may be grouped to one action. In that case, press the action to reveal versions to choose from *(like Maya in the picture)*, only applications permitted on the particular project will appear. + ![ftrack-login-3](assets/ftrack/ftrack-login_71-small.png) + +6. Start working ;) + +--- + +## Change Ftrack user +1. Log out the previous user from Ftrack Web app *(skip if new is already logged)* + + ![ftrack-login-3](assets/ftrack/ftrack-login_80-small.png) + +2. Log out the previous user from Ftrack module in OpenPype tray + +
+
+ +![ftrack-login-3](assets/ftrack/ftrack_logout.gif) + +
+
+ +![ftrack-login-3](assets/ftrack/ftrack-login_81.png) + +
+
+ +

+ +3. Follow [Login to Ftrack](#login-to-ftrack-module-in-openpype-best-case-scenario) guide + +--- + +## Where to find API key +- Your API key can be found in Ftrack. In the upper right corner of Ftrack click on the avatar, choose System settings. +- You shouldn't need to use your personal API key if previous steps went through correctly + + ![ftrack-api](assets/ftrack/ftrack-api.png) + +- Scroll down in left panel and select `API keys`. Then pick `Create` button. + + ![ftrack-api](assets/ftrack/ftrack-api2.png) + +- New window will pop up. Choose the `API role` and press `Save` + + ![ftrack-api](assets/ftrack/ftrack-api3.png) + +- Then your new API will be created. + + ![ftrack-api](assets/ftrack/ftrack-api4.png) + +- Copy them and put it into the Ftrack login window. + + ![ftrack-api](assets/ftrack/ftrack-login-api.png) + + +--- +## What if... + +### Ftrack login window didn't pop up and Ftrack menu is not in tray +**1. possibility - OpenPype didn't load properly** +- try to restart OpenPype + +**2. possibility - Ftrack is not set in OpenPype** +- inform your administrator or supervisor + + +### Web browser did not open +**1. possibility - button was not pressed** +- Try to press again the `Ftrack` button in *Ftrack login* window + +**2. possibility - Ftrack URL is not set or is not right** +- Check **Ftrack URL** value in *Ftrack login* window +- Inform your administrator if URL is incorrect and launch OpenPype again when administrator fix it + +**3. possibility - Ftrack Web app can't be reached the way OpenPype use it** +- Enter your **Username** and [API key](#where-to-find-api-key) in *Ftrack login* window and press **Login** button + + ![ftrack-api](assets/ftrack/ftrack-api.gif) +### Ftrack action menu is empty +**1. possibility - OpenPype is not running** +- launch OpenPype and check if it is running in systray + +**2. possibility - You didn't go through Login to Ftrack guide** +- please go through [Login to Ftrack](#login-to-ftrack-module-in-openpype-best-case-scenario) guide + +**3. possibility - User logged to Ftrack Web is not the same as user logged to Ftrack module in tray** +- Follow [Change user](#change-ftrack-user) guide + +**4. possibility - Project doesn't have applications set correctly** +- ask your Project Manager to check if he set applications for the project diff --git a/website/docs/artist_getting_started.md b/website/docs/artist_getting_started.md new file mode 100644 index 0000000000..be1960a38c --- /dev/null +++ b/website/docs/artist_getting_started.md @@ -0,0 +1,84 @@ +--- +title: Getting started with OpenPype +sidebar_label: Getting started +--- + +import Tabs from '@theme/Tabs'; +import TabItem from '@theme/TabItem'; + + +## Working in the studio + +In studio environment you should have OpenPype already installed and deployed, so you can start using it without much setup. Your admin has probably put OpenPype icon on your desktop or even had your computer set up so OpenPype will start automatically. + +If this is not the case, please contact your administrator to consult on how to launch OpenPype in your studio + +## Working from home + +If you are working from home though, you'll need to install it yourself. You should, however, receive the OpenPype installer files from your studio +admin, supervisor or production, because OpenPype versions and executables might not be compatible between studios. + +To install OpenPype you just need to unzip it anywhere on the disk + +To use it, you have two options + +**openpype_gui.exe** is the most common for artists. It runs OpenPype GUI in system tray. From there you can run all the available tools. To use any of the features, OpenPype must be running in the tray. + +**openpype_console.exe** in usefull for debugging and error reporting. It opens console window where all the necessary information will appear during user's work. + + + + + + +WIP - Windows instructions once installers are finished + + + + +WIP - Linux instructions once installers are finished + + + + +WIP - Mac instructions once installers are finished + + + + + +## First Launch + + +When you first start OpenPype, you will be asked to give it some basic information. +### MongoDB + +In most cases that will only be your studio MongoDB Address. + +It is a URL that you should receive from you studio and most often will look like this `mongodb://username:passwword@mongo.mystudiodomain.com:12345` or `mongodb://192.168.100.15:27071`, it really depends on your studio setup. When OpenPype Igniter +asks for it, just put it in the corresponding text field and press `install` button. + +### OpenPype Version Repository + +Sometimes your studio might also ask you to fill in the path to it's version +repository. This is a location where OpenPype will be looking for when checking +if it's up to date and where updates are installed from automatically. + +This pat is usually taken from the database directly, so you shouldn't need it. + + +## Updates + +If you're connected to your studio, OpenPype will check for, and install updates automatically everytime you run it. That's why during the first start, it will go through a quick update installation process, even though you might have just installed it. + + +## Advanced use + +For more advanced use of OpenPype commands please visit [Admin section](admin_openpype_commands). diff --git a/website/docs/artist_hosts.md b/website/docs/artist_hosts.md new file mode 100644 index 0000000000..609f6d97c8 --- /dev/null +++ b/website/docs/artist_hosts.md @@ -0,0 +1,17 @@ +--- +id: artist_hosts +title: Hosts +sidebar_label: Hosts +--- + +## Maya + +## Houdini + +## Nuke + +## Fusion + +## Unreal + +## System diff --git a/website/docs/artist_hosts_aftereffects.md b/website/docs/artist_hosts_aftereffects.md new file mode 100644 index 0000000000..879c0d4646 --- /dev/null +++ b/website/docs/artist_hosts_aftereffects.md @@ -0,0 +1,107 @@ +--- +id: artist_hosts_aftereffects +title: AfterEffects +sidebar_label: AfterEffects +--- + +## Available Tools + +- [Work Files](artist_tools.md#workfiles) +- [Create](artist_tools.md#creator) +- [Load](artist_tools.md#loader) +- [Publish](artist_tools.md#publisher) +- [Manage](artist_tools.md#inventory) +- [Subset Manager](artist_tools.md#subset-manager) + +## Setup + +To install the extension, download, install [Anastasyi's Extention Manager](https://install.anastasiy.com/). Open Anastasyi's Extension Manager and select AfterEffects in menu. Then go to `{path to pype}/repos/avalon-core/avalon/aftereffects/extension.zxp`. + +Drag extension.zxp and drop it to Anastasyi's Extension Manager. The extension will install itself. + +## Implemented functionality + +AfterEffects implementation currently allows you to import and add various media to composition (image plates, renders, audio files, video files etc.) +and send prepared composition for rendering to Deadline. + +## Usage + +When you launch AfterEffects you will be met with the Workfiles app. If don't +have any previous workfiles, you can just close this window. + +Workfiles tools takes care of saving your .AEP files in the correct location and under +a correct name. You should use it instead of standard file saving dialog. + +In AfterEffects you'll find the tools in the `OpenPype` extension: + +![Extension](assets/photoshop_extension.PNG) + +You can show the extension panel by going to `Window` > `Extensions` > `OpenPype`. + +### Create + +When you have created an composition you want to publish, you will need to tag existing composition. To do this open the `Creator` through the extensions `Create` button. + +![Creator](assets/aftereffects_creator.png) + +Because of current rendering limitations, it is expected that only single composition will be marked for publishing! + +After Creator is successfully triggered on selected composition, it will be marked with an icon and its color +will be changed. + +![Higlights](assets/aftereffects_creator_after.png) + +### Publish + +When you are ready to share your work, you will need to publish it. This is done by opening the `Publish` by clicking the corresponding button in the OpenPype Panel. + +![Publish](assets/aftereffects_publish.png) + +This tool will run through checks to make sure the contents you are publishing is correct. Hit the "Play" button to start publishing. + +You may encounter issues with publishing which will be indicated with red squares. If these issues are within the validation section, then you can fix the issue. If there are issues outside of validation section, please let the OpenPype team know. For More details have a look at the general [Publish](artist_tools.md#publisher) documentation. + +### Load + +When you want to load existing published work, you can use the `Loader` tool. You can reach it in the extension's panel. + +![Loader](assets/photoshop_loader.PNG) + +The supported families for loading into AfterEffects are: + +- `image` +- `plate` +- `render` +- `prerender` +- `review` +- `audio` +- `background` `(set of images sorted in predefined order)` + +To load an item, right-click on the subset you want and choose a representation you want to load: + +![Loader](assets/photoshop_loader_load.gif) + +### Manage + +Now that we have some content loaded, you can manage which version is loaded. This is done through the `Scene Manager`. You can reach it through the extension's `Manage` button. + +:::note +Loaded images have to stay as smart layers in order to be updated. If you rasterize the layer, you can no longer update it to a different version using OpenPype tools. +::: + +![Loader](assets/photoshop_manage.PNG) + +You can switch to a previous version of the image or update to the latest. + +![Loader](assets/photoshop_manage_switch.gif) +![Loader](assets/photoshop_manage_update.gif) + +### Subset Manager + +![subset_manager](assets/tools_subset_manager.png) + +All created compositions will be shown in a simple list. If user decides, that this composition shouldn't be +published after all, right click on that item in the list and select 'Remove instance' + +Removing composition direclty in the AE would result to worfile contain phantom metadata which could result in +errors during publishing! \ No newline at end of file diff --git a/website/docs/artist_hosts_blender.md b/website/docs/artist_hosts_blender.md new file mode 100644 index 0000000000..877e99bff4 --- /dev/null +++ b/website/docs/artist_hosts_blender.md @@ -0,0 +1,226 @@ +--- +id: artist_hosts_blender +title: Blender +sidebar_label: Blender +--- + +## OpenPype global tools + +- [Set Context](artist_tools.md#set-context) +- [Work Files](artist_tools.md#workfiles) +- [Create](artist_tools.md#creator) +- [Load](artist_tools.md#loader) +- [Manage (Inventory)](artist_tools.md#inventory) +- [Publish](artist_tools.md#publisher) +- [Library Loader](artist_tools.md#library-loader) + +## Working with OpenPype in Blender + +OpenPype is here to ease you the burden of working on project with lots of +collaborators, worrying about naming, setting stuff, browsing through endless +directories, loading and exporting and so on. To achieve that, OpenPype is using +concept of being _"data driven"_. This means that what happens when publishing +is influenced by data in scene. This can by slightly confusing so let's get to +it with few examples. + + +## Setting scene data + +Blender settings concerning framerate, resolution and frame range are handled +by OpenPype. If set correctly in Ftrack, Blender will automatically set the +values for you. + + +## Publishing models + +### Intro + +Publishing models in Blender is pretty straightforward. Create your model as you +need. You might need to adhere to specifications of your studio that can be different +between studios and projects but by default your geometry does not need any +other convention. + +![Model example](assets/blender-model_example.jpg) + +### Creating instance + +Now create **Model instance** from it to let OpenPype know what in the scene you want to +publish. Go **OpenPype → Create... → Model**. + +![Model create instance](assets/blender-model_create_instance.jpg) + +`Asset` field is a name of asset you are working on - it should be already filled +with correct name as you've started Blender or switched context to specific asset. You +can edit that field to change it to different asset (but that one must already exists). + +`Subset` field is a name you can decide on. It should describe what kind of data you +have in the model. For example, you can name it `Proxy` to indicate that this is +low resolution stuff. See [Subset](artist_concepts#subset). + + + +Read-only field just under it show final subset name, adding subset field to +name of the group you have selected. + +`Use selection` checkbox will use whatever you have selected in Outliner to be +wrapped in Model instance. This is usually what you want. Click on **Create** button. + +You'll notice then after you've created new Model instance, there is a new +collection in Outliner called after your asset and subset, in our case it is +`character1_modelDefault`. The assets selected when creating the Model instance +are linked in the new collection. + +And that's it, you have your first model ready to publish. + +Now save your scene (if you didn't do it already). You will notice that path +in Save dialog is already set to place where scenes related to modeling task on +your asset should reside. As in our case we are working on asset called +**character1** and on task **modeling**, path relative to your project directory will be +`project_XY/assets/character1/work/modeling`. The default name for the file will +be `project_XY_asset_task_version`, so in our case +`simonetest_character1_modeling_v001.blend`. Let's save it. + +![Model create instance](assets/blender-save_modelling_file.jpg) + +### Publishing models + +Now let's publish it. Go **OpenPype → Publish...**. You will be presented with following window: + +![Model publish](assets/blender-model_pre_publish.jpg) + +Note that content of this window can differs by your pipeline configuration. +For more detail see [Publisher](artist_tools#publisher). + +Items in left column are instances you will be publishing. You can disable them +by clicking on square next to them. White filled square indicate they are ready for +publishing, red means something went wrong either during collection phase +or publishing phase. Empty one with gray text is disabled. + +See that in this case we are publishing from the scene file +`simonetest_character1_modeling_v001.blend` the Blender model named +`character1_modelDefault`. + +Right column lists all tasks that are run during collection, validation, +extraction and integration phase. White items are optional and you can disable +them by clicking on them. + +Lets do dry-run on publishing to see if we pass all validators. Click on flask +icon at the bottom. Validators are run. Ideally you will end up with everything +green in validator section. + +### Fixing problems + +For the sake of demonstration, I intentionally kept the model in Edit Mode, to +trigger the validator designed to check just this. + +![Failed Model Validator](assets/blender-model_publish_error.jpg) + +You can see our model is now marked red in left column and in right we have +red box next to `Mesh is in Object Mode` validator. + +You can click on arrow next to it to see more details: + +![Failed Model Validator details](assets/blender-model_error_details.jpg) + +From there you can see in **Records** entry that there is problem with the +object `Suzanne`. Some validators have option to fix problem for you or just +select objects that cause trouble. This is the case with our failed validator. + +In main overview you can notice little A in a circle next to validator +name. Right click on it and you can see menu item `select invalid`. This +will select offending object in Blender. + +Fix is easy. Without closing Publisher window we just turn back the Object Mode. +Then we need to reset it to make it notice changes we've made. Click on arrow +circle button at the bottom and it will reset the Publisher to initial state. Run +validators again (flask icon) to see if everything is ok. + +It should OK be now. Write some comment if you want and click play icon button +when ready. + +Publish process will now take its course. Depending on data you are publishing +it can take a while. You should end up with everything green and message +**Finished successfully ...** You can now close publisher window. + +To check for yourself that model is published, open +[Asset Loader](artist_tools#loader) - **OpenPype → Load...**. +There you should see your model, named `modelDefault`. + +### Loading models + +You can load model with [Loader](artist_tools.md#loader). Go **OpenPype → Load...**, +select your rig, right click on it and click **Link model (blend)**. + +## Creating Rigs + +Creating and publishing rigs with OpenPype follows similar workflow as with +other data types. Create your rig and mark parts of your hierarchy in sets to +help OpenPype validators and extractors to check it and publish it. + +### Preparing rig for publish + +When creating rigs in Blender, it is important to keep a specific structure for +the bones and the geometry. Let's first create a model and its rig. For +demonstration, I'll create a simple model for a robotic arm made of simple boxes. + +![Blender - Simple model for rigging](assets/blender-rig_model_setup.jpg) + +I have now created the armature `RIG_RobotArm`. While the naming is not important, +you can just adhere to your naming conventions, the hierarchy is. Once the models +are skinned to the armature, the geometry must be organized in a separate Collection. +In this case, I have the armature in the main Collection, and the geometry in +the `Geometry` Collection. + +![Blender - Rig Hierarchy Example](assets/blender-rig_hierarchy_example.jpg) + +When you've prepared your hierarchy, it's time to create *Rig instance* in OpenPype. +Select your whole rig hierarchy and go **OpenPype → Create...**. Select **Rig**. + +![Blender - Rig Hierarchy Example](assets/blender-rig_create.jpg) + +A new collection named after the selected Asset and Subset should have been created. +In our case, it is `character1_rigDefault`. All the selected armature and models +have been linked in this new collection. You should end up with something like +this: + +![Blender - Rig Hierarchy Example](assets/blender-rig_hierarchy_before_publish.jpg) + +### Publishing rigs + +Publishing rig is done in same way as publishing everything else. Save your scene +and go **OpenPype → Publish**. For more detail see [Publisher](artist_tools#publisher). + +### Loading rigs + +You can load rig with [Loader](artist_tools.md#loader). Go **OpenPype → Load...**, +select your rig, right click on it and click **Link rig (blend)**. + +## Layouts in Blender + +A layout is a set of elements that populate a scene. OpenPype allows to version +and manage those sets. + +### Publishing a layout + +Working with Layout is easy. Just load your assets into scene with +[Loader](artist_tools.md#loader) (**OpenPype → Load...**). Populate your scene as +you wish, translate each piece to fit your need. When ready, select all imported +stuff and go **OpenPype → Create...** and select **Layout**. When selecting rigs, +you need to select only the armature, the geometry will automatically be included. +This will create set containing your selection and marking it for publishing. + +Now you can publish is with **OpenPype → Publish**. + +### Loading layouts + +You can load a Layout using [Loader](artist_tools.md#loader) +(**OpenPype → Load...**). Select your layout, right click on it and +select **Link Layout (blend)**. This will populate your scene with all those +models you've put into layout. \ No newline at end of file diff --git a/website/docs/artist_hosts_harmony.md b/website/docs/artist_hosts_harmony.md new file mode 100644 index 0000000000..3e945a2852 --- /dev/null +++ b/website/docs/artist_hosts_harmony.md @@ -0,0 +1,128 @@ +--- +id: artist_hosts_harmony +title: Harmony +sidebar_label: Harmony +--- + +## Available Tools + +- [Work Files](artist_tools.md#workfiles) +- [Create](artist_tools.md#creator) +- [Load](artist_tools.md#loader) +- [Publish](artist_tools.md#publisher) +- [Manage](artist_tools.md#inventory) + +:::note +Only one tool can be open at a time. If you open a tool while another tool is open, it will wait in queue for the existing tool to be closed. Once the existing tool is closed, the new tool will open. +::: + +## Usage + +The integration creates an `OpenPype` menu entry where all related tools are located. + +:::note +Menu creation can be temperamental. Its best to start Harmony and do nothing else until the application is fully launched. +If you dont see the `OpenPype` menu, then follow this to create it: +- Go to the `Script Editor` +- Find the script called `TB_sceneOpened.js` and run it. +- Choose the `start` method to run. +::: + +### Workfiles + +`OpenPype > Workfiles` + +Work files are temporarily stored locally, in `[user]/.avalon/harmony`, to reduce network bandwidth. When saving the Harmony scene, a background process ensures the network files are updated. + +:::important +Because the saving to the network location happens in the background, be careful when quickly saving and closing Harmony (and the terminal window) since an interrupted saving to the network location can corrupt the workfile. To be sure the workfile is saved to the network location look in the terminal for a line similar to this: + +`DEBUG:avalon.harmony.lib:Saved "[Local Scene Directory]" to "[Network Scene Directory]\[Name Of Workfile].zip"` +::: + +### Create + +`OpenPype > Create` + +![Creator](assets/harmony_creator.PNG) + +These are the families supported in Harmony: + +- `Render` + - This instance is for generating a render and review. This is a normal write node, but only PNGs are supported at the moment. +- `Template` + - This instance is for generating a templates. This is a normal composite node, which you can connect any number of nodes to. + - Any connected nodes will be published along with their dependencies and any back drops. +- `Palette` + - Palettes are indirectly supported in Harmony. This means you just have to have palettes in your scene to publish them. + +When you `Use selection` on creation, the last selected node will be connected to the created node. + +### Publish + +`OpenPype > Publish` + +![Publish](assets/photoshop_publish.PNG) + +This tool will run through checks to make sure the contents you are publishing is correct. Hit the "Play" button to start publishing. + +You may encounter issues with publishing which will be indicated with red squares. If these issues are within the validation section, then you can fix the issue. If there are issues outside of validation section, please let the OpenPype team know. + +#### Repair Validation Issues + +All validators will give some description about what the issue is. You can inspect this by going into the validator through the arrow: + +![Inspect](assets/photoshop_publish_inspect.PNG) + +You can expand the errors by clicking on them for more details: + +![Expand](assets/photoshop_publish_expand.PNG) + +Some validator have repair actions, which will fix the issue. If you can identify validators with actions by the circle icon with an "A": + +![Actions](assets/photoshop_publish_actions.PNG) + +To access the actions, you right click on the validator. If an action runs successfully, the actions icon will turn green. Once all issues are fixed, you can just hit the "Refresh" button and try to publish again. + +![Repair](assets/photoshop_publish_repair.gif) + +### Load + +`OpenPype > Load` + +![Loader](assets/photoshop_loader.PNG) + +The supported families for Harmony are: + +- `image` +- `harmony.template` + - Only import is current supported for templates. +- `harmony.palette` + - Loaded palettes are moved to the top of the colour stack, so they will acts as overrides. Imported palettes are left in the scene. +- `workfile` + - Only of type `zip`. + +To load, right-click on the subset you want and choose a representation: + +![Loader](assets/photoshop_loader_load.gif) + +:::note +Loading templates or workfiles will import the contents into scene. Referencing is not supported at the moment, so you will have to load newer versions into the scene. +::: + +### Manage + +`OpenPype > Manage` + +![Loader](assets/photoshop_manage.PNG) + +You can switch to a previous version of the image or update to the latest. + +![Loader](assets/photoshop_manage_switch.gif) +![Loader](assets/photoshop_manage_update.gif) + +:::note +Images and image sequences will be loaded into the scene as read nodes can coloured green. On startup the pipeline checks for any outdated read nodes and colours them red. +- Green = Up to date version in scene. +- Red = Outdated version in scene. +::: diff --git a/website/docs/artist_hosts_maya.md b/website/docs/artist_hosts_maya.md new file mode 100644 index 0000000000..1ed326ebe7 --- /dev/null +++ b/website/docs/artist_hosts_maya.md @@ -0,0 +1,693 @@ +--- +id: artist_hosts_maya +title: Maya +sidebar_label: Maya +--- + +## OpenPype global tools + +- [Set Context](artist_tools.md#set-context) +- [Work Files](artist_tools.md#workfiles) +- [Create](artist_tools.md#creator) +- [Load](artist_tools.md#loader) +- [Manage (Inventory)](artist_tools.md#inventory) +- [Publish](artist_tools.md#publisher) +- [Library Loader](artist_tools.md#library-loader) + +## Working with OpenPype in Maya + +OpenPype is here to ease you the burden of working on project with lots of +collaborators, worrying about naming, setting stuff, browsing through endless +directories, loading and exporting and so on. To achieve that, OpenPype is using +concept of being _"data driven"_. This means that what happens when publishing +is influenced by data in scene. This can by slightly confusing so let's get to +it with few examples. + +## Publishing models + +### Intro + +Publishing models in Maya is pretty straightforward. Create your model as you +need. You need to adhere to specifications of your studio that can be different +between studios and projects but by default your geometry has to be named properly. +For example `sphere_GEO` or `cube1_GEO`. Geometry needs to have freezed transformations +and must reside under one group, for example `model_GRP`. + +![Model example](assets/maya-model_hierarchy_example.jpg) + +Note that `sphere_GEO` has frozen transformations. + +### Creating instance + +Now create **Model instance** from it to let OpenPype know what in the scene you want to +publish. Go **OpenPype → Create... → Model** + +![Model create instance](assets/maya-model_create_instance.jpg) + +`Asset` field is a name of asset you are working on - it should be already filled +with correct name as you've started Maya or switched context to specific asset. You +can edit that field to change it to different asset (but that one must already exists). + +`Subset` field is a name you can decide on. It should describe what kind of data you +have in the model. For example, you can name it `Proxy` to indicate that this is +low resolution stuff. See [Subset](artist_concepts#subset). + +:::note LOD support +By changing subset name you can take advantage of _LOD support_ in OpenPype. Your +asset can contain various resolution defined by different subsets. You can then +switch between them very easy using [Inventory (Manage)](artist_tools#inventory). +There LODs are conveniently grouped so they don't clutter Inventory view. + +Name your subset like `main_LOD1`. Important part is that `_LOD1`. You can have as many LODs as you need. +::: + +Read-only field just under it show final subset name, adding subset field to +name of the group you have selected. + +`Use selection` checkbox will use whatever you have selected in Outliner to be +wrapped in Model instance. This is usually what you want. Click on **Create** button. + +You'll notice then after you've created new Model instance, there is new set +in Outliner called after your subset, in our case it is `modelMain`. + +And that's it, you have your first model ready to publish. + +Now save your scene (if you didn't do it already). You will notice that path +in Save dialog is already set to place where scenes related to modeling task on +your asset should reside. As in our case we are working on asset called +**Ben** and on task **modeling**, path relative to your project directory will be +`project_XY/assets/ben/work/modeling`. Let's save our scene as `model_test_v01`. + +### Publishing models + +Now let's publish it. Go **OpenPype → Publish...**. You will be presented with following window: + +![Model publish](assets/maya-model_pre_publish.jpg) + +Note that content of this window can differs by your pipeline configuration. +For more detail see [Publisher](artist_tools#publisher). + +Items in left column are instances you will be publishing. You can disable them +by clicking on square next to them. Green square indicate they are ready for +publishing, red means something went wrong either during collection phase +or publishing phase. Empty one with gray text is disabled. + +See that in this case we are publishing from scene file `model_test_v01.mb` in +Maya model named `modelMain (ben)` (next item). Publishing of workfile is +currenly disabled (last item). + +Right column lists all tasks that are run during collection, validation, +extraction and integration phase. White items are optional and you can disable +them by clicking on them. + +Lets do dry-run on publishing to see if we pass all validators. Click on flask +icon at the bottom. Validators are run. Ideally you will end up with everything +green in validator section. + +### Fixing problems + +To make things interesting, I intentionally forgot to freeze transformations +on `sphere_GEO` as I know it will trigger validator designed to check just this. + +![Failed Model Validator](assets/maya-model_publish_error.jpg) + +You can see our model is now marked red in left column and in right we have +red box next to `Transform Zero (Freeze)` validator. + +You can click on arrow next to it to see more details: + +![Failed Model Validator details](assets/maya-model_freeze_error_details.jpg) + +From there you can see in **Records** entry that there is problem with `sphere_GEO`. +Some validators have option to fix problem for you or just select objects that +cause trouble. This is the case with our failed validator. + +In main overview you can notice little up arrow in a circle next to validator +name. Right click on it and you can see menu item `select invalid`. This +will select offending object in Maya. + +Fix is easy. Without closing Publisher window we just freeze transformations. +Then we need to reset it to make it notice changes we've made. Click on arrow +circle button at the bottom and it will reset Publisher to initial state. Run +validators again (flask icon) to see if everything is ok. + +It should be now. Write some comment if you want and click play icon button +when ready. + +Publish process will now take its course. Depending on data you are publishing +it can take a while. You should end up with everything green and message +**Finished successfully ...** You can now close publisher window. + +To check for yourself that model is published, open +[Asset Loader](artist_tools#loader) - **OpenPype → Load...**. +There you should see your model, named `modelMain`. + +## Look development + +Look development in OpenPype is easy. It helps you with versioning different +kinds of shaders and easy switching between them. + +Let se how it works. + +### Loading model + +In this example I have already published model of Buddha. To see how to publish +model with OpenPype see [Publishing Model](artist_hosts_maya#publishing-models). + +First of lets start with empty scene. Now go **OpenPype → Load...** + +![Model loading](assets/maya-model_loading.jpg) + +Here I am loading `modelBuddha`, its version 1 for asset **foo**. Just right-click +on it and select **Reference (abc)**. This will load model into scene as alembic. +Now you can close Loader window. + +### Creating look + +Now you can create whatever look you want. Assign shaders, textures, etc. to model. +In my case, I assigned simple Arnolds _aiSurfaceShader_ and changed its color to red. + +![Look Dev - Red Buddha](assets/maya-look_dev-red_buddha.jpg) + +I am quite happy with it so I want to publish it as my first look. + +### Publishing look + +Select your model in outliner and ho **OpenPype → Create...**. From there +select **Look**. Make sure `use selection` checkbox is checked. +Mine subset name is `Main`. This will create _Look instance_ with a name **lookMain**. + +Close _Creator_ window. + +Now save your scene, give it some sensible name. Next, go **OpenPype → Publish**. +This process is almost identical as publishing models, only different _Validators_ +and other plugins will be used. + +This should be painless and cause no trouble so go ahead, click play icon button at +the bottom and it will publish your look. + +:::note publishing multiple looks +You can reference same model into scene multiple times, change materials on every +instance with what you need. Then on every model create _Look instance_. When +publishing all those _Look instances_ will be published at same time. +::: + +### Loading looks into models + +Now lets see how look are applied. Start new empty scene, load your published +model there as before (using _Reference (abc)_). If you didn't notice until now, +there are few yellow icons in left shelf: + +![Maya - shortcut icons](assets/maya-shortcut_buttons.jpg) + +Those are shortcuts for **Look Manager**, [Work Files](artist_tools.md#workfiles), +[Load](artist_tools.md#loader), and [Manage (Inventory)](artist_tools.md#inventory). + +Those can be found even in top menu, but that depends on your studio setup. + +You are interested now in **Look Manager** - first item with brush icon. Select +your Buddha model and open **Look Manager**. + +![Maya - Look Manager](assets/maya-look_dev-look_manager.jpg) + +This is **Look Manager** window. Yours would be empty until you click **Get All Assets** +or **Get Assets From Selection**. You can use later to quick assign looks if you have +multiple assets loaded in scene. Click on one of those button now. + +You should now see all assets and their subsets loaded in scene, and on right side +all applicable published looks. + +Select you asset and on the right side right click on `Main` look. Apply it. + +You notice that Buddha model is now red, materials you've published are now applied +to it. + +That way you can create looks as you want and version them using OpenPype. + +## Setting scene data + +Maya settings concerning framerate, resolution and frame range are handled by +OpenPype. If set correctly in Ftrack, Maya will validate you have correct fps on +scene save and publishing offering way to fix it for you. + +For resolution and frame range, use **OpenPype → Reset Frame Range** and +**OpenPype → Reset Resolution** + + +## Creating rigs with OpenPype + +Creating and publishing rigs with OpenPype follows similar workflow as with +other data types. Create your rig and mark parts of your hierarchy in sets to +help OpenPype validators and extractors to check it and publish it. + +### Preparing rig for publish + +When creating rigs, it is recommended (and it is in fact enforced by validators) +to separate bones or driving objects, their controllers and geometry so they are +easily managed. Currently OpenPype doesn't allow to publish model at the same time as +its rig so for demonstration purposes, I'll first create simple model for robotic +arm, just made out of simple boxes and I'll publish it. + +![Maya - Simple model for rigging](assets/maya-rig_model_setup.jpg) + +For more information about publishing models, see [Publishing models](artist_hosts_maya#publishing-models). + +Now lets start with empty scene. Load your model - **OpenPype → Load...**, right +click on it and select **Reference (abc)**. + +I've created few bones and their controllers in two separate +groups - `rig_GRP` and `controls_GRP`. Naming is not important - just adhere to +your naming conventions. + +Then I've put everything into `arm_rig` group. + +When you've prepared your hierarchy, it's time to create *Rig instance* in OpenPype. +Select your whole rig hierarchy and go **OpenPype → Create...**. Select **Rig**. +Set is created in your scene to mark rig parts for export. Notice that it has +two subsets - `controls_SET` and `out_SET`. Put your controls into `controls_SET` +and geometry to `out_SET`. You should end up with something like this: + +![Maya - Rig Hierarchy Example](assets/maya-rig_hierarchy_example.jpg) + +### Publishing rigs + +Publishing rig is done in same way as publishing everything else. Save your scene +and go **OpenPype → Publish**. When you run validation you'll mostly run at first into +few issues. Although number of them will seem to be intimidating at first, you'll +find out they are mostly minor things easily fixed. + +* **Non Duplicate Instance Members (ID)** - This will most likely fail because when +creating rigs, we usually duplicate few parts of it to reuse them. But duplication +will duplicate also ID of original object and OpenPype needs every object to have +unique ID. This is easily fixed by **Repair** action next to validator name. click +on little up arrow on right side of validator name and select **Repair** form menu. + +* **Joints Hidden** - This is enforcing joints (bones) to be hidden for user as +animator usually doesn't need to see them and they clutter his viewports. So +well behaving rig should have them hidden. **Repair** action will help here also. + +* **Rig Controllers** will check if there are no transforms on unlocked attributes +of controllers. This is needed because animator should have ease way to reset rig +to it's default position. It also check that those attributes doesn't have any +incoming connections from other parts of scene to ensure that published rig doesn't +have any missing dependencies. + +### Loading rigs + +You can load rig with [Loader](artist_tools.md#loader). Go **OpenPype → Load...**, +select your rig, right click on it and **Reference** it. + +## Point caches +OpenPype is using Alembic format for point caches. Workflow is very similar as +other data types. + +### Creating Point Caches + +To create point cache just create whatever hierarchy you want and animate it. +Select its root and Go **OpenPype → Create...** and select **Point Cache**. + +After that, publishing will create corresponding **abc** files. + +Example setup: + +![Maya - Point Cache Example](assets/maya-pointcache_setup.png) + +### Loading Point Caches + +Loading point cache means creating reference to **abc** file with Go **OpenPype → Load...**. + +Example result: + +![Maya - Point Cache Example](assets/maya-pointcache_loaded.png) + +## Set dressing in Maya + +Set dressing is term for easily populate complex scenes with individual parts. +OpenPype allows to version and manage those sets. + +### Publishing Set dress / Layout + +Working with Set dresses is very easy. Just load your assets into scene with +[Loader](artist_tools.md#loader) (**OpenPype → Load...**). Populate your scene as +you wish, translate each piece to fit your need. When ready, select all imported +stuff and go **OpenPype → Create...** and select **Set Dress** or **Layout**. +This will create set containing your selection and marking it for publishing. + +:::note set dress vs layout +Currently *set dress* and *layout* are functionally identical +::: + +Now you can publish is with **OpenPype → Publish**. + +### Loading Set dress / Layout + +You can load Set dress / Layout using [Loader](artist_tools.md#loader) +(**OpenPype → Load...**). Select you layout or set dress, right click on it and +select **Reference Maya Ascii (ma)**. This will populate your scene with all those +models you've put into layout. + +## Rendering with OpenPype + +OpenPype in Maya can be used for submitting renders to render farm and for their +subsequent publishing. Right now OpenPype support [AWS Thinkbox Deadline](https://www.awsthinkbox.com/deadline) +and [Virtual Vertex Muster](https://www.vvertex.com/overview/). + +* For setting up Muster support see [admin section](admin_config#muster) +* For setting up Deadline support see [here](admin_config#aws-thinkbox-deadline) + +:::note Muster login +Muster is now configured so every user must log in to get authentication support. If OpenPype founds out this token is missing or expired, it will ask again for credentials. +::: + +### Creating basic render setup + +If you want to submit your render to farm, just follow these simple steps. + +#### Preparing scene + +Lets start with empty scene. First I'll pull in my favorite Buddha model. +**OpenPype → Load...**, select model and right+click to pop up context menu. From +there just click on **Reference (abc)**. + +Next, I want to be sure that I have same frame range as is set on shot I am working +on. To do this just **OpenPype → Reset Frame Range**. This should set Maya timeline to same +values as they are set on shot in *Ftrack* for example. + +I have my time set, so lets create some animation. We'll turn Buddha model around for +50 frames (this is length of my timeline). + +Select model, go to first frame, key Y axis rotation, go to last frame, enter 360 to +**Channel Editor** Y rotation, key it and its done. If you are not sure how to do it, +you are probably reading wrong documentation. + +Now let set up lights, ground and camera. I am lazy so I create Arnolds Skydome light: +**Arnold → Lights → Skydome Light**. As ground simple Plane will suffice and I'll set +my perspective view as I like and create new camera from it (`CTRL+SHIFT+C`) and rename +it from `persp1` to `mainCamera`. + +One last thing, I'll assign basic *aiSurfaceShader* to my Buddha and do some little +tweaks on it. + +#### Prepare scene for submission + +As we have working simple scene we can start preparing it for rendering. OpenPype is fully utilizing +Render Setup layers for this. First of all, we need to create *Render instance* to tell OpenPype what +to do with renders. You can easily render locally or on render farm without it, but *Render instance* +is here to mark render layers you want to publish. + +Lets create it. Go **OpenPype → Create...**. There select **Render** from list. If you keep +checked **Use selection** it will use your current Render Layers (if you have them). Otherwise, +if no render layers is present in scene, it will create one for you named **Main** and under it +default collection with `*` selector. + +No matter if you use *Deadline* or *Muster*, OpenPype will try to connect to render farm and +fetch machine pool list. + +:::note Muster login +This might fail on *Muster* in the event that you have expired authentication token. In that case, you'll be presented with login window. Nothing will be created in the scene until you log in again and do create **Render** again. +::: + +So now my scene now looks like this: + +![Maya - Render scene Setup](assets/maya-render_setup.jpg) + +You can see that it created `renderingMain` set and under it `LAYER_Main`. This set corresponds to +**Main** render layer in Render Setup. This was automatically created because I had not created any +render layers in scene before. If you already have layers and you use **Use selection**, they will +appear here, prefixed with `LAYER_`. Those layer set are created whenever you create new layer in +Render Setup and are deleted if you delete layer in Render Setup. However if you delete `LAYER_` set, +layer in Render Setup isn't deleted. It just means it won't be published. + +Creating *Render instance* will also set image prefix in render settings to OpenPype defaults based on +renderer you use - for example if you render with Arnold, it is `maya///_`. + +There are few setting on *Render instance* `renderingMain` in **Attributes Editor**: + +![Maya - Render attributes](assets/maya-renderglobals.jpg) + +Few options that needs explaining: + +* `Primary Pool` - here is list of pool fetched from server you can select from. +* `Suspend publish Job` - job sent to farm will not start render automatically +but is in *waiting* state. +* `Extend Frames` - if checked it will add new frames to previous render, so you can +extend previous image sequence. +* `Override Existing Frame` - will overwrite file in destination if they exists +* `Priority` is priority of job on farm +* `Frames Per Task` is number of sequence division between individual tasks (chunks) +making one job on farm. + +Now if you run publish, you notice there is in right column new item called +`Render Layers` and in it there is our new layer `Main (999_abc_0010) [1-10]`. First part is +layer name, second `(999_abc_0010)` is asset name and rest is frame range. + +![Maya - Render Publish errors](assets/maya-render_publish_detail1.jpg) + +You see I already tried to run publish but was stopped by few errors. Lets go +through them one by one just to see what we need to set up further in scene for +successful publish. + +**No Default Cameras Renderable** is telling me: + +```fix +Renderable default cameras found: [u'|persp|perspShape'] +``` + +and so can be resolved by simple change in *Main* layer render settings. +All I have to do is just remove the `persp` camera from render settings and add there correct camera. + +This leaves me only with **Render Settings** error. If I click on it to see +details, I see it has problem with animation not being enabled: + +```fix +Animation needs to be enabled. Use the same frame for start and end to render single frame +``` + +Go to **Render Settings**, select your render layer and in **Common** tab change +in **File Output** `Frame/Animation ext` to whatever you want, just not _Single Frame_. +Set **Frame Range** `Start frame` and `End frame` according your needs. + +If you run into problems with *image file prefix* - this should be set correctly when +creating *Render instance*, but you can tweak it. It needs to begin with `maya/` token +to avoid render conflicts between DCCs. It needs to have `` or `` (vray) and +`` or `` (vray). If you have more then one renderable cameras, add `` token. + +Sane default for arnold, redshift or renderman is: + +```fix +maya//_ +``` + +and for vray: + +```fix +maya// +``` + +Doing **OpenPype → Reset Resolution** will set correct resolution on camera. + +Scene is now ready for submission and should publish without errors. + +:::tip what happens when I publish my render scene +When publishing is finished, job is created on farm. This job has one more dependent job connected to itself. +When render is finished, this other job triggers in and run publish again, but this time it is publishing rendered image sequence and creating quicktime movie for preview from it. Only those rendered sequences that have **beauty** AOV get preview as it doesn't make sense to make it for example from cryptomatte. +::: + +### Attaching render to subset + +You can create render that will be attached to another subset you are publishing, rather than being published on its own. Let's assume, you want to render a model turnaround. +In the scene from where you want to publish your model create *Render subset*. Prepare your render layer as needed and then drag +model subset (Maya set node) under corresponding `LAYER_` set under *Render instance*. During publish, it will submit this render to farm and +after it is rendered, it will be attached to your model subset. + +## Render Setups + +### Publishing Render Setups + +OpenPype can publish whole **Render Settings** setup. You can then version in and load it to +any Maya scene. This helps TDs to distribute per asset/shots render settings for Maya. + +To publish render settings, go **OpenPype → Create...** and select **Render Setup Preset**. + +In your scene will appear set `rendersetup`. This one has no settings, only its presence +in scene will trigger publishing of render settings. + +When you publish scene, current settings in **Render Settings** will be serialized to json file. + +### Loading Render Setups + +In any scene, you can load published render settings with **OpenPype → Load...**. Select your published +render setup settings, right+click on it and select **Load RenderSetup template**. + +This will load and parse json file and apply all setting there to your Render Setting. + +:::warning +This will overwrite all setting you already have. +::: + +## Reviews + +OpenPype supports creating review video for almost any type of data you want to publish. +What we call review video is actually _playblast_ or _capture_ (depending on terminology +you are familiar with) made from pre-defined camera in scene. This is very useful +in cases where you want to add turntable preview of your model for example. But it can +be used to generate preview for animation, simulations, and so on. + +### Setting scene for review extraction + +Lets see how review publishing works on simple scene. We will publish model with +turntable preview video. + +I'll be using Stanford University dragon model. Start with empty scene. +Create your model, import it or load from OpenPype. I'll just import model as OBJ +file. + +After we have our model in, we need to set everything to be able to publish it +as model - for detail see [Publishing models](artist_hosts_maya#publishing-models). + +To recap - freeze transforms, rename it to `dragon_GEO` and put it into group +`dragon_GRP`. Then select this group and **OpenPype → Create...** and choose **Model**. + +Now, lets create camera we need to generate turntable video. I prefer to animate +camera itself and not model because all animation keys will be associated with camera +and not model we want to publish. + +I've created camera, named it `reviewCamera` and parent it under `reviewRotation_LOC` +locator. I set my timeline to 50 frames, key `reviewRotation_LOC` Y axis on frame +1 to 0 and on frame 50 to 360. I've also set animation curve between those two keys +to linear. + +To mark camera to be used for review, select camera `reviewCamera` and go **OpenPype → Create...** +and choose **Review**. + +This will create set `review` including selected camera. You can set few options +on this set to control review video generation: + +* `Active` - control on/off state +* `Frame Start` - starting frame for review +* `Frame End` - end frame for review +* `Handles` - number of handle frame before and after +* `Step` - number of steps +* `Fps` - framerate + +This is my scene: + +![Maya - Review model setup](assets/maya-model_review_setup.jpg) + +_* note that I had to fix UVs and normals on Stanford dragon model as it wouldn't pass +model validators_ + +### Publishing model with review + +You can now publish your model and generate review video. Go **OpenPype → Publish...**, +validate if you will, and publish it. During publishing, Maya will create _playblast_ +for whole frame range you've specified, then it will pass those frames to _ffmpeg_. +That will create video file, pass it to another extractor creating burnins in it +and finally uploading this video to ftrack with your model (or other type) published +version. All parts of this process - like what burnins, what type of video file, +settings for Maya playblast - can be customized by your TDs. For more information +about customizing review process refer to [admin section](admin_presets_plugins). + + +## Working with Yeti in OpenPype + +OpenPype can work with [Yeti](https://peregrinelabs.com/yeti/) in two data modes. +It can handle Yeti caches and Yeti rigs. + +### Creating and publishing Yeti caches + +Let start by creating simple Yeti setup, just one object and Yeti node. Open new +empty scene in Maya and create sphere. Then select sphere and go **Yeti → Create Yeti Node on Mesh** +Open Yeti node graph **Yeti → Open Graph Editor** and create setup like this: + +![Maya - Yeti Basic Graph](assets/maya-yeti_basic_setup.jpg) + +It doesn't matter what setting you use now, just select proper shape in first +*Import* node. Select your Yeti node and create *Yeti Cache instance* - **OpenPype → Create...** +and select **Yeti Cache**. Leave `Use selection` checked. You should end up with this setup: + +![Maya - Yeti Basic Setup](assets/maya-yeti_basic_setup_outline.jpg) + +You can see there is `yeticacheDefault` set. Instead of *Default* it could be named with +whatever name you've entered in `subset` field during instance creation. + +We are almost ready for publishing cache. You can check basic settings by selecting +Yeti cache set and opening *Extra attributes* in Maya **Attribute Editor**. + +![Maya - Yeti Basic Setup](assets/maya-yeti_cache_attributes.jpg) + +Those attributes there are self-explanatory, but: + +- `Preroll` is number of frames simulation will run before cache frames are stored. +This is usefull to "steady" simulation for example. +- `Frame Start` from what frame we start to store cache files +- `Frame End` to what frame we are storing cache files +- `Fps` of cache +- `Samples` how many time samples we take during caching + +You can now publish Yeti cache as any other types. **OpenPype → Publish**. It will +create sequence of `.fur` files and `.fursettings` metadata file with Yeti node +setting. + +### Loading Yeti caches + +You can load Yeti cache by **OpenPype → Load ...**. Select your cache, right+click on +it and select **Load Yeti cache**. This will create Yeti node in scene and set its +cache path to point to your published cache files. Note that this Yeti node will +be named with same name as the one you've used to publish cache. Also notice that +when you open graph on this Yeti node, all nodes are as they were in publishing node. + +### Creating and publishing Yeti Rig + +Yeti Rigs are working in similar way as caches, but are more complex and they deal with +other data used by Yeti, like geometry and textures. + +Let's start by [loading](artist_hosts_maya#loading-model) into new scene some model. +I've loaded my Buddha model. + +Create select model mesh, create Yeti node - **Yeti → Create Yeti Node on Mesh** and +setup similar Yeti graph as in cache example above. + +Then select this Yeti node (mine is called with default name `pgYetiMaya1`) and +create *Yeti Rig instance* - **OpenPype → Create...** and select **Yeti Cache**. +Leave `Use selection` checked. + +Last step is to add our model geometry to rig instance, so middle+drag its +geometry to `input_SET` under `yetiRigDefault` set representing rig instance. +Note that its name can differ and is based on your subset name. + +![Maya - Yeti Rig Setup](assets/maya-yeti_rig.jpg) + +Save your scene and ready for publishing our new simple Yeti Rig! + +Go to publish **OpenPype → Publish** and run. This will publish rig with its geometry +as `.ma` scene, save Yeti node settings and export one frame of Yeti cache from +the beginning of your timeline. It will also collect all textures used in Yeti +node, copy them to publish folder `resource` directory and set *Image search path* +of published node to this location. + +:::note Collect Yeti Cache failure +If you encounter **Collect Yeti Cache** failure during collecting phase, and the error is like +```fix +No object matches name: pgYetiMaya1Shape.cbId +``` +then it is probably caused by scene not being saved before publishing. +::: + +### Loading Yeti Rig + +You can load published Yeti Rigs as any other thing in OpenPype - **OpenPype → Load ...**, +select you Yeti rig and right+click on it. In context menu you should see +**Load Yeti Cache** and **Load Yeti Rig** items (among others). First one will +load that one frame cache. The other one will load whole rig. + +Notice that although we put only geometry into `input_SET`, whole hierarchy was +pulled inside also. This allows you to store complex scene element along Yeti +node. + +:::tip auto-connecting rig mesh to existing one +If you select some objects before loading rig it will try to find shapes +under selected hierarchies and match them with shapes loaded with rig (published +under `input_SET`). This mechanism uses *cbId* attribute on those shapes. +If match is found shapes are connected using their `outMesh` and `outMesh`. Thus you can easily connect existing animation to loaded rig. +::: diff --git a/website/docs/artist_hosts_nuke.md b/website/docs/artist_hosts_nuke.md new file mode 100644 index 0000000000..1e02599570 --- /dev/null +++ b/website/docs/artist_hosts_nuke.md @@ -0,0 +1,145 @@ +--- +id: artist_hosts_nuke +title: Nuke +sidebar_label: Nuke +--- + +:::important +After Nuke starts it will automatically **Apply All Settings** for you. If you are sure the settings are wrong just contact your supervisor and he will set them correctly for you in project database. +::: + +:::note +The workflows are identical for both. We are supporting versions **`11.0`** and above. +::: + +## OpenPype global tools + +- [Set Context](artist_tools.md#set-context) +- [Work Files](artist_tools.md#workfiles) +- [Create](artist_tools.md#creator) +- [Load](artist_tools.md#loader) +- [Manage (Inventory)](artist_tools.md#inventory) +- [Publish](artist_tools.md#publisher) +- [Library Loader](artist_tools.md#library-loader) + +## Nuke specific tools + +
+
+ +### Set Frame Ranges + +Use this feature in case you are not sure the frame range is correct. + +##### Result + +- setting Frame Range in script settings +- setting Frame Range in viewers (timeline) + +
+
+ +![Set Frame Ranges](assets/nuke_setFrameRanges.png) + +
+
+ + +
+ +![Set Frame Ranges Timeline](assets/nuke_setFrameRanges_timeline.png) + +
+ +1. limiting to Frame Range without handles +2. **Input** handle on start +3. **Output** handle on end + +
+
+ +### Set Resolution + +
+
+ + +This menu item will set correct resolution format for you defined by your production. + +##### Result + +- creates new item in formats with project name +- sets the new format as used + +
+
+ +![Set Resolution](assets/nuke_setResolution.png) + +
+
+ + +### Set Colorspace + +
+
+ +This menu item will set correct Colorspace definitions for you. All has to be configured by your production (Project coordinator). + +##### Result + +- set Colorspace in your script settings +- set preview LUT to your viewers +- set correct colorspace to all discovered Read nodes (following expression set in settings) + +
+
+ +![Set Colorspace](assets/nuke_setColorspace.png) + +
+
+ + +### Apply All Settings + +
+
+ +It is usually enough if you once per while use this option just to make yourself sure the workfile is having set correct properties. + +##### Result + +- set Frame Ranges +- set Colorspace +- set Resolution + +
+
+ +![Apply All Settings](assets/nuke_applyAllSettings.png) + +
+
+ +### Build Workfile + +
+
+ +This tool will append all available subsets into an actual node graph. It will look into database and get all last [versions](artist_concepts.md#version) of available [subsets](artist_concepts.md#subset). + + +##### Result + +- adds all last versions of subsets (rendered image sequences) as read nodes +- adds publishable write node as `renderMain` subset + +
+
+ +![Build First Work File](assets/nuke_buildFirstWorkfile.png) + +
+
\ No newline at end of file diff --git a/website/docs/artist_hosts_nukestudio.md b/website/docs/artist_hosts_nukestudio.md new file mode 100644 index 0000000000..23301f53bf --- /dev/null +++ b/website/docs/artist_hosts_nukestudio.md @@ -0,0 +1,284 @@ +--- +id: artist_hosts_nukestudio +title: Hiero +sidebar_label: Hiero / Nuke Studio +--- + +import Tabs from '@theme/Tabs'; +import TabItem from '@theme/TabItem'; + +:::note +All the information also applies to **_Nuke Studio_**, but for simplicity we only refer to Hiero. The workflows are identical for both. We are supporting versions **`11.0`** and above. +::: + + +## Hiero specific tools + + + +
+
+ +### Create Default Tags + +This tool will recreate all necessary OpenPype tags needed for successful publishing. It is automatically ran at start of the Hiero. Use this tool to manually re-create all the tags if you accidentaly delete them, or you want to reset them to default values. + +
+
+ +![Default Tags](assets/nukestudio_defaultTags.png) + +
+
+ +#### Result + +- Will create tags in Tags bin in case there were none +- Will set all tags to default values if they have been altered + +## Publishing Shots + + + +
+
+ +With OpenPype, you can use Hiero as a starting point for creating project hierarchy in avalon and ftrack database (episodes, sequences, shots, folders etc.), publishing plates, reference quicktimes, audio and various soft effects that will be evailable later on for compositors and 3D artist to use. + +There are two ways to `Publish` data and create shots in database from Hiero. Use either context menu on right clicking selected clips or go to top `menu > OpenPype > Publish`. + +
+
+ +![Clips naming](assets/nukestudio_basic_clipNaming.png) + +
+
+ +Keep in mind that the publishing currently works on selected shots + +Shot names for all the related plates that you want to publish (subsets) has to be the same to be correctly paired together (as it is shown in image). +Note the layer **review** which contains `plateMainReview`. +This media is just h264, 1920x1080 video for that will be used as preview of the actual `plateMain` subset and will be uploaded to Ftrack. We explain how to work with review tag in [**Reviewing**](#reviewing). + + +:::important +To to successfuly publish a shot from Hiero: +1. At least one clip of your shot must be tagged with `Hierarchy`, `subset` and `handleStart/End`. +2. Your source media must be pre-cut to correct length (including handles) +::: + +### Tagging + + +OpenPype's custom tags are used for defining shot parameters and to define which clips and how they are going to be published. + +If you want to add any properties to your clips you'll need to adjust values on the given tag and then drag it onto the clip. + + +
+ +![Tags basic](assets/nukestudio_tagsToClips_basic.png) + +
+ +1. double click on preferable tag and drag&drop it to selected clip(s) +2. Basic set of tags on clip (usually subset: plateMain) +3. Additionally select clip and edit its parameters +4. Edit parameters here but do not touch `family` + +
+
+ +:::important +Only clips with `subset` will be directly processed for publishing. +::: + +### Custom Tags Details + +#### Asset related +| Icon | Description | Editable | Options | +| ------------------- | ---------------------------------------------------------------------------------- | ------------------------------------- | ---------------------------------------------------------------------------------------- | +| ![Hierarchy][hi] | Define parent hierarchy of the shot. Usually combined with one of subset tags. | root, folder, sequence, episode, shot | example: {sequence} = name of Hiero sequence or overwrite by any text without `-` or `_` | +| ![Frame Start][fst] | Set start frame of the shot. Using `"source"` will keep original frame numbers. | number | int `number` or `"source"` | + + +#### Subsets + +| Icon | Description | Editable | Options | +| ------------------ | ------------------------------------------------------------------------------ | -------- | --------------------------------- | +| ![Review][rew] | Choose which track holds review quicktime for the given shot. | track | `"review"` or other track name | +| ![Plate Main][pmn] | Main plate subset identifier | subset | `"main"` or other | +| ![Plate FG][pfg] | Foreground plate subset identifier (comped over the main plate) | subset | `"Fg##"` or other | +| ![Plate BG][pbg] | Background plate subset identifier (comped under the main plate) | subset | `"Bg##"` or other | +| ![Plate Ref][ref] | Reference plate subset identifier | subset | `"Ref"` or other | + +#### Subset's attributes + +| Icon | Description | Editable | Options | +| ------------------ | --------------------------------------------------------------------------------- | ------------------- | ----------------------------- | +| ![Resolution][rsl] | Use source resolution instead of sequence settings. | none | | +| ![Retiming][rtm] | Publish retime metadata to shot if retime or time-warp found on clip | marginIn, marginOut | int `number` frame cushioning | +| ![Lens][lns] | Specify lens focal length metadata (work in progress) | focalLengthMm | int `number` | + +#### Handles + +| Icon | Description | Editable | Options | +| --------------------- | ---------------------------------------------------------------------------- | -------- | -------------------------- | +| ![Handles Start][ahs] | Handles at the start of the clip/shot | value | change to any int `number` | +| ![Handles End][ahe] | Handles at the end of a clip/shot | value | change to any int `number` | + +[hi]: assets/nks_icons/hierarchy.png + +[ahs]: assets/nks_icons/3_add_handles_start.png + +[ahe]: assets/nks_icons/1_add_handles_end.png + +[rsl]: assets/nks_icons/resolution.png + +[rtm]: assets/nks_icons/retiming.png + +[rew]: assets/nks_icons/review.png + +[pmn]: assets/nks_icons/z_layer_main.png + +[pfg]: assets/nks_icons/z_layer_fg.png + +[pbg]: assets/nks_icons/z_layer_bg.png + +[lns]: assets/nks_icons/lense1.png + +[fst]: assets/nks_icons/frame_start.png + +[ref]: assets/nks_icons/reference.png + +### Handles + +OpenPype requires handle information in shot metadata even if they are set to 0. +For this you need to add handles tags to the main clip (Should be the one with Hierarchy tag). +This way we are defining a shot property. In case you wish to have different +handles on other subsets (e.g. when plateBG is longer than plateFG) you can add handle tags with different value to this longer plate. + +If you wish to have different handles length (say 100) than one of the default tags, simply drag `start: add 10 frames` to your clip +and then go to clips tags, find the tag, then replace 10 for 100 in name and also change value to 100. +This is also explained following tutorial [`Extending premade handles tags`](#extending-premade-handles-tags) + +:::caution +Even if you don't need any handles you have to add `start: add 0 frames` and `end: add 0 frames` tags to the clip with Hierarchy tag. +::: + +### Retiming + +OpenPype is also able to publish retiming parameters into the database. +Any clip with **editorial**/**retime** or **TimeWarp** soft effect has to be tagged with `Retiming` tag, if you want this information preserved during publishing. + +Any animation on **TimeWarp** is also preserved and reapplied in _Nuke_. + +You can only combine **retime** and with a single **Timewarp**. + +### Reviewing + +There are two ways to publish reviewable **h264 mov** into OpenPype (and Ftrack). + + + + + + + +The first one uses the Review Tag pointing to the track that holds the reviewable quicktimes for plates. + +This tag metadata has `track` key inside that points to `review` track by default. If you drop this tag onto any publishable clip on the timeline you're telling OpenPype "you will find quicktime version of this plate on `review` track (clips must have the same name)" + +In the image on the right we dropped it to **plateMain** clip. Then we renamed the layer tha hold reviewable quicktime called `plateMainReview`. You can see that the clip names are the same. + + + +
+ +![Reviewing](assets/nukestudio_reviewing.png) + +
+ +1. `-review` suffix is added to publishing item label if any reviewable file is found +2. `plateMain` clip is holding the Review tag +3. layer name is `review` as it is used as default in _Review_ Tag in _track_ +4. name of clip is the same across all subsets + +
+
+ + + + + +Second way would be to add the **h264 mov 1920x1080** into the same folder +as image sequence. The name of the file has to be the same as image sequence. +Publisher will pick this file up and add it to the files list during collecting. +This will also add `"- review"` to instance label in **Publish**. + +Example: + +- img seq: `image_sequence_name.0001.exr` +- mov: `image_sequence_name.mov` + + + + + +-------------- + + +### LUT Workflow + + +
+
+ +It is possible to publish Hiero soft effects for compositors to use later on. You can add the effect to a particular clip or to whole layer as shows on the picture. All clips +below the `Video 6` layer (green arrow) will be published with the **LUT** subset which combines all the colour corrections from he soft effects. Any clips above the `Video 6` layer will have no **LUT** published with them. + + +
+
+ +![Reviewing](assets/nukestudio_softEffects.png) + +
+
+ +Any external Lut files used in the soft effects will be copied over to `resources` of the published subset folder `lutPlateMain` (in our example). + +:::note + +
+
+ +You cannot currently publish soft effects on their own because at the moment we only support soft effects as a part of other subset publishing. Image is demonstrating successful publishing. + +
+
+ +![Reviewing](assets/nukestudio_lutSucess.png) + +
+
+ +::: + +## Tutorials + + +### Basic publishing with soft effects + + + + +### Extending premade handles tags + + diff --git a/website/docs/artist_hosts_photoshop.md b/website/docs/artist_hosts_photoshop.md new file mode 100644 index 0000000000..7e84349565 --- /dev/null +++ b/website/docs/artist_hosts_photoshop.md @@ -0,0 +1,107 @@ +--- +id: artist_hosts_photoshop +title: Photoshop +sidebar_label: Photoshop +--- + +## Available Tools + +- [Work Files](artist_tools.md#workfiles) +- [Create](artist_tools.md#creator) +- [Load](artist_tools.md#loader) +- [Publish](artist_tools.md#publisher) +- [Manage](artist_tools.md#inventory) + +## Setup + +To install the extension, download, install [Anastasyi's Extention Manager](https://install.anastasiy.com/). Open Anastasyi's Extension Manager and select Photoshop in menu. Then go to `{path to pype}/repos/avalon-core/avalon/photoshop/extension.zxp`. Drag extension.zxp and drop it to Anastasyi's Extension Manager. The extension will install itself. + +## Usage + +When you launch Photoshop you will be met with the Workfiles app. If dont have any previous workfiles, you can just close this window. + +In Photoshop you can find the tools in the `OpenPype` extension: + +![Extension](assets/photoshop_extension.PNG) + +You can show the extension panel by going to `Window` > `Extensions` > `OpenPype`. + +### Create + +When you have created an image you want to publish, you will need to create special groups or tag existing groups. To do this open the `Creator` through the extensions `Create` button. + +![Creator](assets/photoshop_creator.PNG) + +With the `Creator` you have a variety of options to create: + +- Check `Use selection` (A dialog will ask whether you want to create one image per selected layer). + - Yes. + - No selection. + - This will create a single group named after the `Subset` in the `Creator`. + - Single selected layer. + - The selected layer will be grouped under a single group named after the selected layer. + - Single selected group. + - The selected group will be tagged for publishing. + - Multiple selected items. + - Each selected group will be tagged for publishing and each layer will be grouped individually. + - No. + - All selected layers will be grouped under a single group named after the `Subset` in the `Creator`. +- Uncheck `Use selection`. + - This will create a single group named after the `Subset` in the `Creator`. + +### Publish + +When you are ready to share some work, you will need to publish. This is done by opening the `Pyblish` through the extensions `Publish` button. + +![Publish](assets/photoshop_publish.PNG) + +This tool will run through checks to make sure the contents you are publishing is correct. Hit the "Play" button to start publishing. + +You may encounter issues with publishing which will be indicated with red squares. If these issues are within the validation section, then you can fix the issue. If there are issues outside of validation section, please let the OpenPype team know. + +#### Repair Validation Issues + +All validators will give some description about what the issue is. You can inspect this by going into the validator through the arrow: + +![Inspect](assets/photoshop_publish_inspect.PNG) + +You can expand the errors by clicking on them for more details: + +![Expand](assets/photoshop_publish_expand.PNG) + +Some validator have repair actions, which will fix the issue. If you can identify validators with actions by the circle icon with an "A": + +![Actions](assets/photoshop_publish_actions.PNG) + +To access the actions, you right click on the validator. If an action runs successfully, the actions icon will turn green. Once all issues are fixed, you can just hit the "Refresh" button and try to publish again. + +![Repair](assets/photoshop_publish_repair.gif) + +### Load + +When you want to load existing published work, you can load in smart layers through the `Loader`. You can reach the `Loader` through the extension's `Load` button. + +![Loader](assets/photoshop_loader.PNG) + +The supported families for Photoshop are: + +- `image` + +To load an image, right-click on the subset you want and choose a representation: + +![Loader](assets/photoshop_loader_load.gif) + +### Manage + +Now that we have some images loaded, we can manage which version is loaded. This is done through the `Scene Inventory`. You can reach it through the extension's `Manage` button. + +:::note +Loaded images has to stay as smart layers in order to be updated. If you rasterize the layer, you cannot update it to a different version. +::: + +![Loader](assets/photoshop_manage.PNG) + +You can switch to a previous version of the image or update to the latest. + +![Loader](assets/photoshop_manage_switch.gif) +![Loader](assets/photoshop_manage_update.gif) diff --git a/website/docs/artist_hosts_unreal.md b/website/docs/artist_hosts_unreal.md new file mode 100644 index 0000000000..1c2c22937c --- /dev/null +++ b/website/docs/artist_hosts_unreal.md @@ -0,0 +1,40 @@ +--- +id: artist_hosts_unreal +title: Unreal +sidebar_label: Unreal +--- + +## Introduction + +OpenPype supports Unreal in similar ways as in other DCCs Yet there are few specific you need to be aware of. + +### Project naming + +Unreal doesn't support project names starting with non-alphabetic character. So names like `123_myProject` are +invalid. If OpenPype detects such name it automatically prepends letter **P** to make it valid name, so `123_myProject` will become `P123_myProject`. There is also soft-limit on project name length to be shorter then 20 characters. Longer names will issue warning in Unreal Editor that there might be possible side effects. + +## OpenPype global tools + +OpenPype global tools can be found in *Window* main menu: + +![Unreal OpenPype Menu](assets/unreal-avalon_tools.jpg) + +- [Create](artist_tools.md#creator) +- [Load](artist_tools.md#loader) +- [Manage (Inventory)](artist_tools.md#inventory) +- [Publish](artist_tools.md#publisher) +- [Library Loader](artist_tools.md#library-loader) + +## Static Mesh + +### Loading + +To import Static Mesh model, just choose **OpenPype → Load ...** and select your mesh. Static meshes are transfered as FBX files as specified in [Unreal Engine 4 Static Mesh Pipeline](https://docs.unrealengine.com/en-US/Engine/Content/Importing/FBX/StaticMeshes/index.html). This action will create new folder with subset name (`unrealStaticMeshMain_CON` for example) and put all data into it. Inside, you can find: + +![Unreal Container Content](assets/unreal-container.jpg) + +In this case there is **lambert1**, material pulled from Maya when this static mesh was published, **unrealStaticMeshCube** is the geometry itself, **unrealStaticMeshCube_CON** is a *AssetContainer* type and is there to mark this directory as Avalon Container (to track changes) and to hold OpenPype metadata. + +### Publishing + +Publishing of Static Mesh works in similar ways. Select your mesh in *Content Browser* and **OpenPype → Create ...**. This will create folder named by subset you've choosen - for example **unrealStaticMeshDefault_INS**. It this folder is that mesh and *Avalon Publish Instance* asset marking this folder as publishable instance and holding important metadata on it. If you want to publish this instance, go **OpenPype → Publish ...** \ No newline at end of file diff --git a/website/docs/artist_publish.md b/website/docs/artist_publish.md new file mode 100644 index 0000000000..a7cb7a1bad --- /dev/null +++ b/website/docs/artist_publish.md @@ -0,0 +1,184 @@ +--- +id: artist_publish +title: Publishing +sidebar_label: Publishing +--- + +## What is publishing? + +A process of exporting particular data from your work scene to be shared with others. + +Think of publishing as a checkpoint between two people, making sure that we catch mistakes as soon as possible and don’t let them pass through pipeline step that would eventually need to be repeated if these mistakes are not caught. + +Every time you want to share a piece of work with others (be it camera, model, textures, animation or whatever), you need to publish this data. The main reason is to save time down the line and make it very clear what can and cannot be used in production. +This process should mostly be handled by publishing scripts but in certain cases might have to be done manually. + +Published assets should comply to these rules: + +- Clearly named, based on internal naming conventions. +- Versioned (with master version created for certain types of assets). +- Immediately usable, without any dependencies to unpublished assets or work files. +- Immutable + +All of these go into the publish folder for the given entity (shot, asset, sequence) + +:::note +Keep in mind that while publishing the data might take you some extra time, it will save much more time in the long run when your colleagues don’t need to dig through your work files trying to understand them and find that model you saved by hand. +::: + +## Families: + +The Instances are categorized into ‘families’ based on what type of data they contain. Some instances might have multiple families if needed. A shot camera will for example have families 'camera' and 'review' to indicate that it's going to be used for review quicktime, but also exported into a file on disk. + +Following family definitions and requirements are OpenPype defaults and what we consider good industry practice, but most of the requirements can be easily altered to suit the studio or project needs. +Here's a list of supported families + +| Family | Comment | Example Subsets | +| ----------------------- | ------------------------------------------------ | ------------------------- | +| [Model](#model) | Cleaned geo without materials | main, proxy, broken | +| [Look](#look) | Package of shaders, assignments and textures | main, wet, dirty | +| [Rig](#rig) | Characters or props with animation controls | main, deform, sim | +| [Assembly](#assembly) | A complex model made from multiple other models. | main, deform, sim | +| [Layout](#layout) | Simple representation of the environment | main, | +| [Setdress](#setdress) | Environment containing only referenced assets | main, | +| [Camera](#camera) | May contain trackers or proxy geo | main, tracked, anim | +| [Animation](#animation) | Animation exported from a rig. | characterA, vehicleB | +| [Cache](#cache) | Arbitrary animated geometry or fx cache | rest, ROM , pose01 | +| MayaAscii | Maya publishes that don't fit other categories | | +| [Render](#render) | Rendered frames from CG or Comp | | +| RenderSetup | Scene render settings, AOVs and layers | | +| Plate | Ingested, transcode, conformed footage | raw, graded, imageplane | +| Write | Nuke write nodes for rendering | | +| Image | Any non-plate image to be used by artists | Reference, ConceptArt | +| LayeredImage | Software agnostic layered image with metadata | Reference, ConceptArt | +| Review | Reviewable video or image. | | +| Matchmove | Matchmoved camera, potentially with geometry | main | +| Workfile | Backup of the workfile with all its content | uses the task name | +| Nukenodes | Any collection of nuke nodes | maskSetup, usefulBackdrop | +| Yeticache | Cached out yeti fur setup | | +| YetiRig | Yeti groom ready to be applied to geometry cache | main, destroyed | +| VrayProxy | Vray proxy geometry for rendering | | +| VrayScene | Vray full scene export | | +| ArnodldStandin | All arnold .ass archives for rendering | main, wet, dirty | +| LUT | | | +| Nukenodes | | | +| Gizmo | | | +| Nukenodes | | | +| Harmony.template | | | +| Harmony.pallette | | | + + + +### Model + +Clean geometry without any material assignments. Published model can be as small as a single mesh, or as complex as a full building. That is purely up to the artist or the supervisor. Models can contain hierarchy defined by groups or nulls for better organisation. + +Apart from model subsets, we also support LODs as extra level on top of subset. To publish LODs, you just need to prepare subsets for publishing names `modelMySubsetName_LOD##`, if OpenPype finds `_LOD##` (hashes replaced with LOD level), it will automatically be considered a LOD of the given subset. + +Example Subsets: +`modelMain`, `modelProxy`, `modelSculpt`, `modelBroken`, `modelMain_LOD01`, `modelMain_LOD02` + +Example representations: +`.ABC`, `.MA`, `.MB`, `.BLEND`, `.OBJ`, `.FBX` + + +### Look + +A package of materials, shaders, assignments, textures and attributes that collectively define a look of a model for rendering or preview purposes. This can usually be applied only to the model is was authored for, or its corresponding cache, however, material sharing across multiple models is also possible. A look should be fully self-contained and ready for rendering. + +Example Subsets: +`lookMain`, `lookProxy`, `lookWet`, `lookDirty`, `lookBlue`, `lookRed` + +Example Representations: +`.MA + .JSON`, `.MTLX (yet unsupported)`, `.BLEND` + +Please note that a look is almost never a single representation, but a combination of multiple. +For example in Maya a look consists of `.ma` file with the shaders, `.json` file which +contains the attributes and assignments and `/resources` folder with all the required textures. + + +### Rig + +Characters or props with animation controls or other parameters, ready to be referenced into a scene and animated. Animation Rigs tend to be very software specific, but in general they tend to consist of Geometry, Bones or Joints, Controllers and Deformers. OpenPype in maya supports both, self-contained rigs, that include everything in one file, but also rigs that use nested references to bring in geometry, or even skeleton. By default we bake rigs into a single file during publishing, but that behaviour can be turned off to keep the nested references live in the animation scenes. + +Example Subsets: +`rigMain`, `rigMocap`, `rigSim`, `rigCamera`, `rigMuscle` + +Example Representations: +`.MA`, `.MB`, `.BLEND`, `.HDA` + + +### Assembly + +A subset created by combining two or more smaller subsets into a composed bigger asset. +A good example would be a restaurant table asset with the cutlery and chairs included, +that will eventually be loaded into a restaurant Set. Instead of loading each individual +fork and knife for each table in the restaurant, we can first prepare `assemblyRestaurantTable` subset +which will contain the table itself, with cutlery, flowers, plates and chairs nicely arranged. + +This table can then be loaded multiple times into the restaurant for easier scene management +and updates. + +Extracted assembly doesn't contain any geometry directly, but rather information about all the individual subsets that are inside the assembly, their version and transformations. On top of that and alembic is exported which only holds any extra transforms and groups that are needed to fully re-create the original assembled scene. + +Assembly ca also be used as a sort of collection of elements that are often used together in the shots. For example if we're set dressing lot's of forest shots, it would make sense to make and assembly of all the forest elements for scattering so we don't have to load them individually into each shot. + +Example Subsets: +`assemblyTable`, `assemblyForestElements`, `assemblyRoof` + +Example Representations: +`.ABC + .JSON` + + + +### Setdress + +Fully prepared environment scene assembled from other previously published assets. Setdress should be ready for rendering as is, including any instancing, material assignments and other complex setups the environment requires. Due to this complexity, setdress is currently only publishable in the native file format of the host where it was created. In maya that would be `.ma` or `.mb` file. + + +### Camera + +Clean virtual camera without any proprietary rigging, or host specific information. Considering how widely across the hosts published cameras are used in production, published camera should ideally be as simple and clean as possible to ensure consistency when loaded into various hosts. + + +Example Representations: +`.MA`, `.ABC` + + +### Cache + +Geometry or effect with baked animation. Cache is usually exported as alembic, +but can be potentially any other representation that makes sense in the given scenario. +Cache is defined by the artist directly in the fx or animation scene. + +Example Subsets: +`assemblyTable`, `assemblyForestElements`, `assemblyRoof` + +Example Representations: +`.ABC`, `.VDB`, `.BGEO` + + +### Animation + +Published result of an animation created with a rig. Animation can be extracted +as animation curves, cached out geometry or even fully animated rig with all the controllers. +Animation cache is usually defined by a rigger in the rig file of a character or +by FX TD in the effects rig, to ensure consistency of outputs. + +Example Subsets: +`animationBob_01`, `animationJack_02`, `animationVehicleA` + +Example Representations: +`.MA`, `.ABC`, `.JSON` + + +### Yeti Cache + +Cached out yeti fur simulation that originates from a yeti rig applied in the shot context. + + +### Yeti Rig + +Yeti groom setup ready to be applied to a cached out character in the shot context. + +### Render diff --git a/website/docs/artist_tools.md b/website/docs/artist_tools.md new file mode 100644 index 0000000000..f03ea8e249 --- /dev/null +++ b/website/docs/artist_tools.md @@ -0,0 +1,414 @@ +--- +id: artist_tools +title: Tools +sidebar_label: Tools +--- + +## Set Context + + +
+
+ +Any time your host app is open in defined context it can be changed to different hierarchy, asset or task within a project. This will allow you to change your opened session to any other asset, shot and tasks within the same project. This is useful particularly in cases where your host takes long time to start. + +
+
+ +![workfiles_1](assets/tools_context_manager.png) +
+
+ + + +:::note + +Notice that the window doesn't close after hitting `Accept` and confirming the change of context. This behaviour let's you keep the window open and change the context multiple times in a row. +::: + +## Creator + +### Details + +Despite the name, Creator isn't for making new content in your scene, but rather taking what's already in it and creating all the metadata your content needs to be published. + +In Maya this means creating a set with everything you want to publish and assigning custom attributes to it so it get's picked up during publishing stage. + +In Nuke it's either converting an existing write node to a publishable one, or simply creating a write node with all the correct settings and outputs already set. + +### Usage + +1. select what you want to publish from your scenes +2. Open *Creator* from OpenPype menu +3. Choose what family (data type) you need to export +4. Type the name for you export. This name is how others are going to be able to refer to this particular subset when loading it into their scenes. Every assets should have a Main subset, but can have any number of other variants. +5. Click on *Create* + + * * * + +## Loader +Loader loads published subsets into your current scene or script. + +### Usage +1. open *Loader* from OpenPype menu +2. select the asset where the subset you want to load is published +3. from subset list select the subset you want +4. right-click the subset +5. from action menu select what you want to do *(load, reference, ...)* + + +![tools_loader_1](assets/tools/tools_loader_1.png) + +
+
+ +### Refresh data +Data are not auto-refreshed to avoid database issues. To refresh assets or subsets press refresh button. + +
+
+ +![tools_loader_50](assets/tools/tools_loader_50.png) + +
+
+ +### Load another version +Loader by default load last version, but you can of course load another versions. Double-click on the subset in the version column to expose the drop down, choose version you want to load and continue from point 4 of the [Usage](#usage-1). + +
+
+ + ![tools_loader_21](assets/tools/tools_loader_21.png) +
+
+ + ![tools_loader_22](assets/tools/tools_loader_22.png) +
+
+ + +### Filtering + +#### Filter Assets and Subsets by name +To filter assets/subsets by name just type name or part of name to filter text input. Only assets/subsets containing the entered string remain. + +- **Assets filtering example** *(it works the same for subsets)*: + +
+
+ +![tools_loader_4](assets/tools/tools_loader_4-small.png) + +
+
+ +![tools_loader_5](assets/tools/tools_loader_5-small.png) + +
+
+ + +#### Filter Subsets by Family + +
+
+ +To filter [subsets](artist_concepts#subset) by their [families](artist_publish#families) you can use families list where you can check families you want to see or uncheck families you are not interested in. + +
+
+ +![tools_loader_30](assets/tools/tools_loader_30-small.png) + +
+
+ + + +### Subset groups +Subsets may be grouped which can help to make the subset list more transparent. You can toggle visibility of groups with `Enable Grouping` checkbox. + +![tools_loader_40](assets/tools/tools_loader_40-small.png) + + +#### Add to group or change current group +You can set group of selected subsets with shortcut `Ctrl + G`. + +![tools_loader_41](assets/tools/tools_loader_41-small.png) + + +:::warning +You'll set the group in Avalon database so your changes will take effect for all users. +::: + +Work in progress... + +## Library Loader + +Library loader is extended [loader](#loader) which allows to load published subsets from Library projects. Controls are same but library loader has extra Combo Box which allows you to choose project you want to load from. + +
+
+ +![tools_library_1](assets/tools/tools_library_1-small.png) + +
+
+ +![tools_library_2](assets/tools/tools_library_2-small.png) + +
+
+ +* * * + +## Publisher + +> Use publish to share your work with others. It collects, validates and exports the data in standardized way. + +### Details + +When you run pyblish, the UI is made of 2 main parts. On the left, you see all the items pyblish will be working with (called instances), and on the right a list of actions that are going to process these items. +Even though every task type has some pre-defined settings of what should be collected from the scene and what items will be published by default. You can technically publish any output type from any task type. +Each item is passed through multiple plugins, each doing a small piece of work. These are organized into 4 areas and run in sequence. + +### Using Pyblish + +In the best case scenario, you open pyblish from the Avalon menu, press play, wait for it to finish, and you’re done. +These are the steps in detail, for cases, where the default settings don’t work for you or you know that the task you’re working on, requires a different treatment. + +#### Collect + +Finds all the important data in the scene and makes it ready for publishing + +#### Validate + +Each validator makes sure your output complies to one particular condition. This could be anything from naming conventions, scene setting, to plugin usage. An item can only be published if all validators pass. + +#### Extract + +Extractor takes the item and saves it to the disk. Usually to temporary location. Each extractor represents one file format and there can be multiple file formats exported for each item. + +#### Integrate + +Integrator takes the extracted files, categorizes and moves them to a correct location on the disk or on the server. + +* * * + +## Inventory + +With Scene Inventory, you can browse, update and change subsets loaded with [Loader](#loader) into your scene or script. + +:::note +You should first understand [Key concepts](artist_concepts#) to understand how you can use this tool. +::: + +### Details + + +Once a subset is loaded, it turns into a container within a scene. This containerization allows us to have a good overview of everything in the scene, but also makes it possible to change versions, notify user if something is outdated, replace one asset for another, etc. + + +The scene manager has a simple GUI focused on efficiency. You can see everything that has been previously loaded into the scene, how many time it's been loaded, what version and a lot of other information. Loaded assets are grouped by their asset name, subset name and representation. This grouping gives ability to apply changes for all instances of the loaded asset *(e.g. when __tree__ is loaded 20 times you can easily update version for all of them)*. + +![tools_scene_inventory_10](assets/tools/tools_scene_inventory_10-small.png) + +To interact with any container, you need to right click it and you'll see a drop down with possible actions. The key actions for production are already implemented, but more will be added over time. + +![tools_scene_inventory_20](assets/tools/tools_scene_inventory_20.png) + +### Usage + +#### Change version +You can change versions of loaded subsets with scene inventory tool. Version of loaded assets is colored to red when newer version is available. + + +![tools_scene_inventory_40](assets/tools/tools_scene_inventory_40.png) + +##### Update to the latest version +Select containers or subsets you want to update, right-click selection and press `Update to latest`. + +##### Change to specific version +Select containers or subsets you want to change, right-click selection, press `Set version`, select from dropdown version you want change to and press `OK` button to confirm. + + +![tools_scene_inventory_30](assets/tools/tools_scene_inventory_30.png) + + +#### Switch Asset +It's tool in Scene inventory tool that gives ability to switch asset, subset and representation of loaded assets. + + +![tools_scene_inventory_50](assets/tools/tools_scene_inventory_50.png) + + +Because loaded asset is in fact representation of version published in asset's subset it is possible to switch each of this part *(representation, version, subset and asset)*, but with limitations. Limitations are obvious as you can imagine when you have loaded `.ma` representation of `modelMain` subset from `car` asset it is not possible to switch subset to `modelHD` and keep same representation if `modelHD` does not have published `.ma` representation. It is possible to switch multiple loaded assets at once that makes this tool very powerful helper if all published assets contain same subsets and representations. + +Switch tool won't let you cross the border of limitations and inform you when you have to specify more if impossible combination occurs *(It is also possible that there will be no possible combination for selected assets)*. Border is colored to red and confirm button is not enabled when specification is required. + + +![tools_scene_inventory_55](assets/tools/tools_scene_inventory_55.png) + + +Possible switches: +- switch **representation** (`.ma` to `.abc`, `.exr` to `.dpx`, etc.) +- switch **subset** (`modelMain` to `modelHD`, etc.) + - `AND` keep same **representation** *(with limitations)* + - `AND` switch **representation** *(with limitations)* +- switch **asset** (`oak` to `elm`, etc.) + - `AND` keep same **subset** and **representation** *(with limitations)* + - `AND` keep same **subset** and switch **representation** *(with limitations)* + - `AND` switch **subset** and keep same **representation** *(with limitations)* + - `AND` switch **subset** and **representation** *(with limitations)* + +We added one more switch layer above subset for LOD (Level Of Depth). That requires to have published subsets with name ending with **"_LOD{number}"** where number represents level (e.g. modelMain_LOD1). Has the same limitations as mentioned above. This is handy when you want to change only subset but keep same LOD or keep same subset but change LOD for multiple assets. This option is hidden if you didn't select subset that have published subset with LODs. + +![tools_scene_inventory_54](assets/tools/tools_scene_inventory_54.png) +### Filtering + +#### Filter by name + +There is a search bar on the top for cases when you have a complex scene with many assets and need to find a specific one. + +
+
+ +![tools_scene_inventory_60](assets/tools/tools_scene_inventory_60-small.png) + +
+
+ +![tools_scene_inventory_61](assets/tools/tools_scene_inventory_61-small.png) + +
+
+ + +#### Filter with Cherry-pick selection + +
+
+ +To keep only selected subsets right-click selection and press `Cherry-Pick (Hierarchy)` *(Border of subset list change to **orange** color when Cherry-pick filtering is set so you know filter is applied).* + +
+
+ +![tools_scene_inventory_62-small](assets/tools/tools_scene_inventory_62-small.png) + +
+
+ +
+
+ +To return to original state right-click anywhere in subsets list and press `Back to Full-View`. + +
+
+ +![tools_scene_inventory_63-small](assets/tools/tools_scene_inventory_63-small.png) + +
+
+ + +:::tip +You can Cherry-pick from Cherry-picked subsets. +::: + +* * * + +## Workfiles + +Save new working scenes or scripts, or open the ones you previously worked on. + +### Details + +Instead of digging through your software native file browser, you can simply open the workfiles app and see all the files for the asset or shot you're currently working with. The app takes care of all the naming and the location of your work files. + +When saving a scene you can also add a comment. It is completely up to you how you use this, however we recommend using it for subversion within your current working version. + +Let's say that the last version of the comp you published was v003 and now you're working on the file prj_sh010_compositing_v004.nk if you want to keep snapshots of your work, but not iterate on the main version because the supervisor is expecting next publish to be v004, you can use the comment to do this, so you can save the file under the name prj_sh010_compositing_v004_001 , prj_sh010_compositing_v004_002. the main version is automatically iterated every time you publish something. + +### Usage + +
+
+ +#### To open existing file: + +1. Open Workfiles tool from OpenPype menu +2. Select file from list - the latest version is the highest *(descendent ordering)* +3. Press `Open` button + +
+
+ +![workfiles_1](assets/workfiles_1.png) + +
+
+ + +#### To save new workfile +1. Open Workfiles tool from OpenPype menu +2. Press `Save As` button +3. You can add optional comment to the filename, that will be appended at the end +4. Press `OK` + +:::note +You can manually override the workfile version by unticking next available version and using the version menu to choose your own. +::: + +## Look Assigner + +> The Look Manager takes care of assigning published looks to the correct model in the scene. + +### Details + +When a look is published it also stores the information about what shading networks need to be assigned to which models, but it also stores all the render attributes on the mesh necessary for a successful render. + +### Usage + +Look Assigner has GUI is made of two parts. On the left you will see the list of all the available models in the scene and on the right side, all the looks that can be associate with them. To assign a look to a model you just need to: + +1. Click on "load all subsets" +2. Choose a subset from the menu on the left +3. Right click on a look from the list on the right +4. Choose "Assign" + +At this point you should have a model with all it's shaders applied correctly. The tool automatically loads the latest look available. + + +## Subset Manager + +> Subset Manager lists all items which are meant for publishig and will be published if Publish is triggered + +### Details + +One or more items (instances) could be published any time Publish process is started. Each this publishable +item must be created by Creator tool previously. Subset Manager provides easy way how to check which items, +and how many, will be published. + +It also provides clean and preferrable way how to remove unwanted item from publishing. + +### Usage + +Subset Manager has GUI is made of two parts. On the left you will see the list of all the available publishable items in the scene and on the right side, details about these items. + +
+ +![subset_manager](assets/tools_subset_manager.png) +
+ +Any time new item is Created, it will show up here. + +Currently there is only single action, 'Remove instance' which cleans workfile file from publishable item metadata. +This might not remove underlying host item, it depends on host and implementation! + +It might also happen that user deletes underlying host item(for example layer in Photoshop) directly in the host, but metadata will stay. +This could result in phantom issues during publishing. Use Subset Manager to purge workfile from abandoned items. + +Please check behaviour in host of your choice. diff --git a/website/docs/artist_work.md b/website/docs/artist_work.md new file mode 100644 index 0000000000..de2290fc0c --- /dev/null +++ b/website/docs/artist_work.md @@ -0,0 +1,23 @@ +--- +id: artist_work +title: Working on tasks +sidebar_label: Working +--- + +Check the [documentation](https://docusaurus.io) for how to use Docusaurus. + +## Lorem + +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus elementum massa eget nulla aliquet sagittis. Proin odio tortor, vulputate ut odio in, ultrices ultricies augue. Cras ornare ultrices lorem malesuada iaculis. Etiam sit amet libero tempor, pulvinar mauris sed, sollicitudin sapien. + +## Mauris In Code + + Mauris vestibulum ullamcorper nibh, ut semper purus pulvinar ut. Donec volutpat orci sit amet mauris malesuada, non pulvinar augue aliquam. Vestibulum ultricies at urna ut suscipit. Morbi iaculis, erat at imperdiet semper, ipsum nulla sodales erat, eget tincidunt justo dui quis justo. Pellentesque dictum bibendum diam at aliquet. Sed pulvinar, dolor quis finibus ornare, eros odio facilisis erat, eu rhoncus nunc dui sed ex. Nunc gravida dui massa, sed ornare arcu tincidunt sit amet. Maecenas efficitur sapien neque, a laoreet libero feugiat ut. + +## Nulla + +Nulla facilisi. Maecenas sodales nec purus eget posuere. Sed sapien quam, pretium a risus in, porttitor dapibus erat. Sed sit amet fringilla ipsum, eget iaculis augue. Integer sollicitudin tortor quis ultricies aliquam. Suspendisse fringilla nunc in tellus cursus, at placerat tellus scelerisque. Sed tempus elit a sollicitudin rhoncus. Nulla facilisi. Morbi nec dolor dolor. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Cras et aliquet lectus. Pellentesque sit amet eros nisi. Quisque ac sapien in sapien congue accumsan. Nullam in posuere ante. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Proin lacinia leo a nibh fringilla pharetra. + +## Orci + +Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin venenatis lectus dui, vel ultrices ante bibendum hendrerit. Aenean egestas feugiat dui id hendrerit. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Curabitur in tellus laoreet, eleifend nunc id, viverra leo. Proin vulputate non dolor vel vulputate. Curabitur pretium lobortis felis, sit amet finibus lorem suscipit ut. Sed non mollis risus. Duis sagittis, mi in euismod tincidunt, nunc mauris vestibulum urna, at euismod est elit quis erat. Phasellus accumsan vitae neque eu placerat. In elementum arcu nec tellus imperdiet, eget maximus nulla sodales. Curabitur eu sapien eget nisl sodales fermentum. diff --git a/website/docs/assets/aftereffects_creator.png b/website/docs/assets/aftereffects_creator.png new file mode 100644 index 0000000000..203ecb6fb7 Binary files /dev/null and b/website/docs/assets/aftereffects_creator.png differ diff --git a/website/docs/assets/aftereffects_creator_after.png b/website/docs/assets/aftereffects_creator_after.png new file mode 100644 index 0000000000..3933202f71 Binary files /dev/null and b/website/docs/assets/aftereffects_creator_after.png differ diff --git a/website/docs/assets/aftereffects_loader.png b/website/docs/assets/aftereffects_loader.png new file mode 100644 index 0000000000..9fd69b04f7 Binary files /dev/null and b/website/docs/assets/aftereffects_loader.png differ diff --git a/website/docs/assets/aftereffects_publish.png b/website/docs/assets/aftereffects_publish.png new file mode 100644 index 0000000000..4cfe3d1d6b Binary files /dev/null and b/website/docs/assets/aftereffects_publish.png differ diff --git a/website/docs/assets/blender-model_create_instance.jpg b/website/docs/assets/blender-model_create_instance.jpg new file mode 100644 index 0000000000..d0891c5d05 Binary files /dev/null and b/website/docs/assets/blender-model_create_instance.jpg differ diff --git a/website/docs/assets/blender-model_error_details.jpg b/website/docs/assets/blender-model_error_details.jpg new file mode 100644 index 0000000000..1756254e5f Binary files /dev/null and b/website/docs/assets/blender-model_error_details.jpg differ diff --git a/website/docs/assets/blender-model_example.jpg b/website/docs/assets/blender-model_example.jpg new file mode 100644 index 0000000000..98d98e903f Binary files /dev/null and b/website/docs/assets/blender-model_example.jpg differ diff --git a/website/docs/assets/blender-model_pre_publish.jpg b/website/docs/assets/blender-model_pre_publish.jpg new file mode 100644 index 0000000000..11233229c5 Binary files /dev/null and b/website/docs/assets/blender-model_pre_publish.jpg differ diff --git a/website/docs/assets/blender-model_publish_error.jpg b/website/docs/assets/blender-model_publish_error.jpg new file mode 100644 index 0000000000..260d9b9996 Binary files /dev/null and b/website/docs/assets/blender-model_publish_error.jpg differ diff --git a/website/docs/assets/blender-rig_create.jpg b/website/docs/assets/blender-rig_create.jpg new file mode 100644 index 0000000000..169ddae84f Binary files /dev/null and b/website/docs/assets/blender-rig_create.jpg differ diff --git a/website/docs/assets/blender-rig_hierarchy_before_publish.jpg b/website/docs/assets/blender-rig_hierarchy_before_publish.jpg new file mode 100644 index 0000000000..81f3916c9e Binary files /dev/null and b/website/docs/assets/blender-rig_hierarchy_before_publish.jpg differ diff --git a/website/docs/assets/blender-rig_hierarchy_example.jpg b/website/docs/assets/blender-rig_hierarchy_example.jpg new file mode 100644 index 0000000000..6ab6897650 Binary files /dev/null and b/website/docs/assets/blender-rig_hierarchy_example.jpg differ diff --git a/website/docs/assets/blender-rig_model_setup.jpg b/website/docs/assets/blender-rig_model_setup.jpg new file mode 100644 index 0000000000..6f967cdab4 Binary files /dev/null and b/website/docs/assets/blender-rig_model_setup.jpg differ diff --git a/website/docs/assets/blender-save_modelling_file.jpg b/website/docs/assets/blender-save_modelling_file.jpg new file mode 100644 index 0000000000..d7f2401c51 Binary files /dev/null and b/website/docs/assets/blender-save_modelling_file.jpg differ diff --git a/website/docs/assets/deadline_configure_event.png b/website/docs/assets/deadline_configure_event.png new file mode 100644 index 0000000000..537a18506c Binary files /dev/null and b/website/docs/assets/deadline_configure_event.png differ diff --git a/website/docs/assets/deadline_configure_plugin.png b/website/docs/assets/deadline_configure_plugin.png new file mode 100644 index 0000000000..f734ca7aca Binary files /dev/null and b/website/docs/assets/deadline_configure_plugin.png differ diff --git a/website/docs/assets/deadline_fail.png b/website/docs/assets/deadline_fail.png new file mode 100644 index 0000000000..7758e35b01 Binary files /dev/null and b/website/docs/assets/deadline_fail.png differ diff --git a/website/docs/assets/ffmpeg_path.png b/website/docs/assets/ffmpeg_path.png new file mode 100644 index 0000000000..6bc99cc2ca Binary files /dev/null and b/website/docs/assets/ffmpeg_path.png differ diff --git a/website/docs/assets/ftrack/ftrack-api.gif b/website/docs/assets/ftrack/ftrack-api.gif new file mode 100644 index 0000000000..b2caf6ca98 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-api.gif differ diff --git a/website/docs/assets/ftrack/ftrack-api.png b/website/docs/assets/ftrack/ftrack-api.png new file mode 100644 index 0000000000..c69967d78e Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-api.png differ diff --git a/website/docs/assets/ftrack/ftrack-api2.png b/website/docs/assets/ftrack/ftrack-api2.png new file mode 100644 index 0000000000..1653f8f603 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-api2.png differ diff --git a/website/docs/assets/ftrack/ftrack-api3.png b/website/docs/assets/ftrack/ftrack-api3.png new file mode 100644 index 0000000000..0ea03f5224 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-api3.png differ diff --git a/website/docs/assets/ftrack/ftrack-api4.png b/website/docs/assets/ftrack/ftrack-api4.png new file mode 100644 index 0000000000..3ee7551dce Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-api4.png differ diff --git a/website/docs/assets/ftrack/ftrack-component_open-icon.png b/website/docs/assets/ftrack/ftrack-component_open-icon.png new file mode 100644 index 0000000000..1ea7a97d4c Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-component_open-icon.png differ diff --git a/website/docs/assets/ftrack/ftrack-component_open_1-small.png b/website/docs/assets/ftrack/ftrack-component_open_1-small.png new file mode 100644 index 0000000000..6a783ab973 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-component_open_1-small.png differ diff --git a/website/docs/assets/ftrack/ftrack-component_open_1.png b/website/docs/assets/ftrack/ftrack-component_open_1.png new file mode 100644 index 0000000000..5fdf16a0a2 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-component_open_1.png differ diff --git a/website/docs/assets/ftrack/ftrack-create_folders-icon.png b/website/docs/assets/ftrack/ftrack-create_folders-icon.png new file mode 100644 index 0000000000..be88cf8993 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-create_folders-icon.png differ diff --git a/website/docs/assets/ftrack/ftrack-create_project_folders-icon.png b/website/docs/assets/ftrack/ftrack-create_project_folders-icon.png new file mode 100644 index 0000000000..06c689267a Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-create_project_folders-icon.png differ diff --git a/website/docs/assets/ftrack/ftrack-custom_attrib_apps.jpg b/website/docs/assets/ftrack/ftrack-custom_attrib_apps.jpg new file mode 100644 index 0000000000..bbd4fd9842 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-custom_attrib_apps.jpg differ diff --git a/website/docs/assets/ftrack/ftrack-delete_asset-icon.png b/website/docs/assets/ftrack/ftrack-delete_asset-icon.png new file mode 100644 index 0000000000..2786ece2d0 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-delete_asset-icon.png differ diff --git a/website/docs/assets/ftrack/ftrack-delivery-icon.png b/website/docs/assets/ftrack/ftrack-delivery-icon.png new file mode 100644 index 0000000000..30775c9a50 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-delivery-icon.png differ diff --git a/website/docs/assets/ftrack/ftrack-login-api.png b/website/docs/assets/ftrack/ftrack-login-api.png new file mode 100644 index 0000000000..d47d46ce2f Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-login-api.png differ diff --git a/website/docs/assets/ftrack/ftrack-login_1.png b/website/docs/assets/ftrack/ftrack-login_1.png new file mode 100644 index 0000000000..cc9b51b39b Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-login_1.png differ diff --git a/website/docs/assets/ftrack/ftrack-login_2.png b/website/docs/assets/ftrack/ftrack-login_2.png new file mode 100644 index 0000000000..e654f70283 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-login_2.png differ diff --git a/website/docs/assets/ftrack/ftrack-login_3.png b/website/docs/assets/ftrack/ftrack-login_3.png new file mode 100644 index 0000000000..1677ea7f57 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-login_3.png differ diff --git a/website/docs/assets/ftrack/ftrack-login_50.png b/website/docs/assets/ftrack/ftrack-login_50.png new file mode 100644 index 0000000000..46d1b3c686 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-login_50.png differ diff --git a/website/docs/assets/ftrack/ftrack-login_60.png b/website/docs/assets/ftrack/ftrack-login_60.png new file mode 100644 index 0000000000..8302c198c3 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-login_60.png differ diff --git a/website/docs/assets/ftrack/ftrack-login_71-small.png b/website/docs/assets/ftrack/ftrack-login_71-small.png new file mode 100644 index 0000000000..0b66ed520d Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-login_71-small.png differ diff --git a/website/docs/assets/ftrack/ftrack-login_71.png b/website/docs/assets/ftrack/ftrack-login_71.png new file mode 100644 index 0000000000..2331dcb4c2 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-login_71.png differ diff --git a/website/docs/assets/ftrack/ftrack-login_80-small.png b/website/docs/assets/ftrack/ftrack-login_80-small.png new file mode 100644 index 0000000000..6473e2bee6 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-login_80-small.png differ diff --git a/website/docs/assets/ftrack/ftrack-login_80.png b/website/docs/assets/ftrack/ftrack-login_80.png new file mode 100644 index 0000000000..67aecd1e84 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-login_80.png differ diff --git a/website/docs/assets/ftrack/ftrack-login_81.png b/website/docs/assets/ftrack/ftrack-login_81.png new file mode 100644 index 0000000000..ae145d6c73 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-login_81.png differ diff --git a/website/docs/assets/ftrack/ftrack-multiple_notes-icon.png b/website/docs/assets/ftrack/ftrack-multiple_notes-icon.png new file mode 100644 index 0000000000..3ebc240df7 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-multiple_notes-icon.png differ diff --git a/website/docs/assets/ftrack/ftrack-multiple_notes_1-small.png b/website/docs/assets/ftrack/ftrack-multiple_notes_1-small.png new file mode 100644 index 0000000000..d4f7bd865e Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-multiple_notes_1-small.png differ diff --git a/website/docs/assets/ftrack/ftrack-multiple_notes_1.png b/website/docs/assets/ftrack/ftrack-multiple_notes_1.png new file mode 100644 index 0000000000..401f02e1ce Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-multiple_notes_1.png differ diff --git a/website/docs/assets/ftrack/ftrack-prepare_project-icon.png b/website/docs/assets/ftrack/ftrack-prepare_project-icon.png new file mode 100644 index 0000000000..44facfa3ae Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-prepare_project-icon.png differ diff --git a/website/docs/assets/ftrack/ftrack-prepare_project_1-small.png b/website/docs/assets/ftrack/ftrack-prepare_project_1-small.png new file mode 100644 index 0000000000..c2d1066ffd Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-prepare_project_1-small.png differ diff --git a/website/docs/assets/ftrack/ftrack-prepare_project_1.png b/website/docs/assets/ftrack/ftrack-prepare_project_1.png new file mode 100644 index 0000000000..488ea5710d Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-prepare_project_1.png differ diff --git a/website/docs/assets/ftrack/ftrack-pype_admin-icon.png b/website/docs/assets/ftrack/ftrack-pype_admin-icon.png new file mode 100644 index 0000000000..f8ccbe66db Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-pype_admin-icon.png differ diff --git a/website/docs/assets/ftrack/ftrack-pype_doctor-icon.png b/website/docs/assets/ftrack/ftrack-pype_doctor-icon.png new file mode 100644 index 0000000000..23c408d373 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-pype_doctor-icon.png differ diff --git a/website/docs/assets/ftrack/ftrack-thumbnail-icon.png b/website/docs/assets/ftrack/ftrack-thumbnail-icon.png new file mode 100644 index 0000000000..f27cd96a3b Binary files /dev/null and b/website/docs/assets/ftrack/ftrack-thumbnail-icon.png differ diff --git a/website/docs/assets/ftrack/ftrack_logout.gif b/website/docs/assets/ftrack/ftrack_logout.gif new file mode 100644 index 0000000000..81088075c4 Binary files /dev/null and b/website/docs/assets/ftrack/ftrack_logout.gif differ diff --git a/website/docs/assets/harmony_creator.PNG b/website/docs/assets/harmony_creator.PNG new file mode 100644 index 0000000000..8593889c64 Binary files /dev/null and b/website/docs/assets/harmony_creator.PNG differ diff --git a/website/docs/assets/maya-look_dev-look_manager.jpg b/website/docs/assets/maya-look_dev-look_manager.jpg new file mode 100644 index 0000000000..54dbf3f667 Binary files /dev/null and b/website/docs/assets/maya-look_dev-look_manager.jpg differ diff --git a/website/docs/assets/maya-look_dev-red_buddha.jpg b/website/docs/assets/maya-look_dev-red_buddha.jpg new file mode 100644 index 0000000000..e003a4ca55 Binary files /dev/null and b/website/docs/assets/maya-look_dev-red_buddha.jpg differ diff --git a/website/docs/assets/maya-model_create_instance.jpg b/website/docs/assets/maya-model_create_instance.jpg new file mode 100644 index 0000000000..0f32f0cb05 Binary files /dev/null and b/website/docs/assets/maya-model_create_instance.jpg differ diff --git a/website/docs/assets/maya-model_freeze_error_details.jpg b/website/docs/assets/maya-model_freeze_error_details.jpg new file mode 100644 index 0000000000..77b3cab005 Binary files /dev/null and b/website/docs/assets/maya-model_freeze_error_details.jpg differ diff --git a/website/docs/assets/maya-model_hierarchy_example.jpg b/website/docs/assets/maya-model_hierarchy_example.jpg new file mode 100644 index 0000000000..661722960c Binary files /dev/null and b/website/docs/assets/maya-model_hierarchy_example.jpg differ diff --git a/website/docs/assets/maya-model_loading.jpg b/website/docs/assets/maya-model_loading.jpg new file mode 100644 index 0000000000..7a7d911c06 Binary files /dev/null and b/website/docs/assets/maya-model_loading.jpg differ diff --git a/website/docs/assets/maya-model_pre_publish.jpg b/website/docs/assets/maya-model_pre_publish.jpg new file mode 100644 index 0000000000..b5827bdb5e Binary files /dev/null and b/website/docs/assets/maya-model_pre_publish.jpg differ diff --git a/website/docs/assets/maya-model_publish_error.jpg b/website/docs/assets/maya-model_publish_error.jpg new file mode 100644 index 0000000000..efe2aff9ba Binary files /dev/null and b/website/docs/assets/maya-model_publish_error.jpg differ diff --git a/website/docs/assets/maya-model_review_setup.jpg b/website/docs/assets/maya-model_review_setup.jpg new file mode 100644 index 0000000000..6c43807596 Binary files /dev/null and b/website/docs/assets/maya-model_review_setup.jpg differ diff --git a/website/docs/assets/maya-pointcache_loaded.png b/website/docs/assets/maya-pointcache_loaded.png new file mode 100644 index 0000000000..398ef5b7ac Binary files /dev/null and b/website/docs/assets/maya-pointcache_loaded.png differ diff --git a/website/docs/assets/maya-pointcache_setup.png b/website/docs/assets/maya-pointcache_setup.png new file mode 100644 index 0000000000..8904baa239 Binary files /dev/null and b/website/docs/assets/maya-pointcache_setup.png differ diff --git a/website/docs/assets/maya-render_publish_detail1.jpg b/website/docs/assets/maya-render_publish_detail1.jpg new file mode 100644 index 0000000000..bfb00ca98a Binary files /dev/null and b/website/docs/assets/maya-render_publish_detail1.jpg differ diff --git a/website/docs/assets/maya-render_setup.jpg b/website/docs/assets/maya-render_setup.jpg new file mode 100644 index 0000000000..4b1c52a593 Binary files /dev/null and b/website/docs/assets/maya-render_setup.jpg differ diff --git a/website/docs/assets/maya-render_setup_window.jpg b/website/docs/assets/maya-render_setup_window.jpg new file mode 100644 index 0000000000..9f4dce1ca9 Binary files /dev/null and b/website/docs/assets/maya-render_setup_window.jpg differ diff --git a/website/docs/assets/maya-renderglobals.jpg b/website/docs/assets/maya-renderglobals.jpg new file mode 100644 index 0000000000..8b4253f23b Binary files /dev/null and b/website/docs/assets/maya-renderglobals.jpg differ diff --git a/website/docs/assets/maya-rig_hierarchy_example.jpg b/website/docs/assets/maya-rig_hierarchy_example.jpg new file mode 100644 index 0000000000..5405005768 Binary files /dev/null and b/website/docs/assets/maya-rig_hierarchy_example.jpg differ diff --git a/website/docs/assets/maya-rig_model_setup.jpg b/website/docs/assets/maya-rig_model_setup.jpg new file mode 100644 index 0000000000..55450e225a Binary files /dev/null and b/website/docs/assets/maya-rig_model_setup.jpg differ diff --git a/website/docs/assets/maya-shortcut_buttons.jpg b/website/docs/assets/maya-shortcut_buttons.jpg new file mode 100644 index 0000000000..ead3b17b99 Binary files /dev/null and b/website/docs/assets/maya-shortcut_buttons.jpg differ diff --git a/website/docs/assets/maya-yeti_basic_setup.jpg b/website/docs/assets/maya-yeti_basic_setup.jpg new file mode 100644 index 0000000000..bdb0408757 Binary files /dev/null and b/website/docs/assets/maya-yeti_basic_setup.jpg differ diff --git a/website/docs/assets/maya-yeti_basic_setup_outline.jpg b/website/docs/assets/maya-yeti_basic_setup_outline.jpg new file mode 100644 index 0000000000..9b6dc18af1 Binary files /dev/null and b/website/docs/assets/maya-yeti_basic_setup_outline.jpg differ diff --git a/website/docs/assets/maya-yeti_cache_attributes.jpg b/website/docs/assets/maya-yeti_cache_attributes.jpg new file mode 100644 index 0000000000..5d5048bf9d Binary files /dev/null and b/website/docs/assets/maya-yeti_cache_attributes.jpg differ diff --git a/website/docs/assets/maya-yeti_rig.jpg b/website/docs/assets/maya-yeti_rig.jpg new file mode 100644 index 0000000000..07b13db409 Binary files /dev/null and b/website/docs/assets/maya-yeti_rig.jpg differ diff --git a/website/docs/assets/nks_icons/1_add_handles_end.png b/website/docs/assets/nks_icons/1_add_handles_end.png new file mode 100644 index 0000000000..4561745d66 Binary files /dev/null and b/website/docs/assets/nks_icons/1_add_handles_end.png differ diff --git a/website/docs/assets/nks_icons/2_add_handles.png b/website/docs/assets/nks_icons/2_add_handles.png new file mode 100644 index 0000000000..bb4c1802aa Binary files /dev/null and b/website/docs/assets/nks_icons/2_add_handles.png differ diff --git a/website/docs/assets/nks_icons/3_add_handles_start.png b/website/docs/assets/nks_icons/3_add_handles_start.png new file mode 100644 index 0000000000..c98e4f74f1 Binary files /dev/null and b/website/docs/assets/nks_icons/3_add_handles_start.png differ diff --git a/website/docs/assets/nks_icons/frame_start.png b/website/docs/assets/nks_icons/frame_start.png new file mode 100644 index 0000000000..af68df4722 Binary files /dev/null and b/website/docs/assets/nks_icons/frame_start.png differ diff --git a/website/docs/assets/nks_icons/hierarchy.png b/website/docs/assets/nks_icons/hierarchy.png new file mode 100644 index 0000000000..6acf39ced5 Binary files /dev/null and b/website/docs/assets/nks_icons/hierarchy.png differ diff --git a/website/docs/assets/nks_icons/lense.png b/website/docs/assets/nks_icons/lense.png new file mode 100644 index 0000000000..255b1753ed Binary files /dev/null and b/website/docs/assets/nks_icons/lense.png differ diff --git a/website/docs/assets/nks_icons/lense1.png b/website/docs/assets/nks_icons/lense1.png new file mode 100644 index 0000000000..1ad1264807 Binary files /dev/null and b/website/docs/assets/nks_icons/lense1.png differ diff --git a/website/docs/assets/nks_icons/reference.png b/website/docs/assets/nks_icons/reference.png new file mode 100644 index 0000000000..7517bd4105 Binary files /dev/null and b/website/docs/assets/nks_icons/reference.png differ diff --git a/website/docs/assets/nks_icons/resolution.png b/website/docs/assets/nks_icons/resolution.png new file mode 100644 index 0000000000..83803fc36d Binary files /dev/null and b/website/docs/assets/nks_icons/resolution.png differ diff --git a/website/docs/assets/nks_icons/retiming.png b/website/docs/assets/nks_icons/retiming.png new file mode 100644 index 0000000000..1c6f22e02c Binary files /dev/null and b/website/docs/assets/nks_icons/retiming.png differ diff --git a/website/docs/assets/nks_icons/review.png b/website/docs/assets/nks_icons/review.png new file mode 100644 index 0000000000..0d894b6987 Binary files /dev/null and b/website/docs/assets/nks_icons/review.png differ diff --git a/website/docs/assets/nks_icons/z_layer_bg.png b/website/docs/assets/nks_icons/z_layer_bg.png new file mode 100644 index 0000000000..51742b5df2 Binary files /dev/null and b/website/docs/assets/nks_icons/z_layer_bg.png differ diff --git a/website/docs/assets/nks_icons/z_layer_fg.png b/website/docs/assets/nks_icons/z_layer_fg.png new file mode 100644 index 0000000000..01e5f4f816 Binary files /dev/null and b/website/docs/assets/nks_icons/z_layer_fg.png differ diff --git a/website/docs/assets/nks_icons/z_layer_main.png b/website/docs/assets/nks_icons/z_layer_main.png new file mode 100644 index 0000000000..0ffb939a7f Binary files /dev/null and b/website/docs/assets/nks_icons/z_layer_main.png differ diff --git a/website/docs/assets/nuke_Create_errorVersionCheck.png b/website/docs/assets/nuke_Create_errorVersionCheck.png new file mode 100644 index 0000000000..85bcc26108 Binary files /dev/null and b/website/docs/assets/nuke_Create_errorVersionCheck.png differ diff --git a/website/docs/assets/nuke_Create_prerenderCustomNode.png b/website/docs/assets/nuke_Create_prerenderCustomNode.png new file mode 100644 index 0000000000..e44985ac1c Binary files /dev/null and b/website/docs/assets/nuke_Create_prerenderCustomNode.png differ diff --git a/website/docs/assets/nuke_Create_renderNodeDifferencesColor.png b/website/docs/assets/nuke_Create_renderNodeDifferencesColor.png new file mode 100644 index 0000000000..410455b6cb Binary files /dev/null and b/website/docs/assets/nuke_Create_renderNodeDifferencesColor.png differ diff --git a/website/docs/assets/nuke_Create_renderNodeDifferencesProperities.png b/website/docs/assets/nuke_Create_renderNodeDifferencesProperities.png new file mode 100644 index 0000000000..a37867b1b7 Binary files /dev/null and b/website/docs/assets/nuke_Create_renderNodeDifferencesProperities.png differ diff --git a/website/docs/assets/nuke_Create_renderNodeProperity.png b/website/docs/assets/nuke_Create_renderNodeProperity.png new file mode 100644 index 0000000000..2795b91ac8 Binary files /dev/null and b/website/docs/assets/nuke_Create_renderNodeProperity.png differ diff --git a/website/docs/assets/nuke_Create_renderNodeProperitySettings.png b/website/docs/assets/nuke_Create_renderNodeProperitySettings.png new file mode 100644 index 0000000000..ee98885216 Binary files /dev/null and b/website/docs/assets/nuke_Create_renderNodeProperitySettings.png differ diff --git a/website/docs/assets/nuke_Create_writeCustomPreRender.png b/website/docs/assets/nuke_Create_writeCustomPreRender.png new file mode 100644 index 0000000000..2345351f98 Binary files /dev/null and b/website/docs/assets/nuke_Create_writeCustomPreRender.png differ diff --git a/website/docs/assets/nuke_Create_writeMainPreRender.png b/website/docs/assets/nuke_Create_writeMainPreRender.png new file mode 100644 index 0000000000..e966444efe Binary files /dev/null and b/website/docs/assets/nuke_Create_writeMainPreRender.png differ diff --git a/website/docs/assets/nuke_Create_writeMainRender.png b/website/docs/assets/nuke_Create_writeMainRender.png new file mode 100644 index 0000000000..8827e5630b Binary files /dev/null and b/website/docs/assets/nuke_Create_writeMainRender.png differ diff --git a/website/docs/assets/nuke_Load_ReadProperities.png b/website/docs/assets/nuke_Load_ReadProperities.png new file mode 100644 index 0000000000..239ee89f25 Binary files /dev/null and b/website/docs/assets/nuke_Load_ReadProperities.png differ diff --git a/website/docs/assets/nuke_Load_ReadProperities1.png b/website/docs/assets/nuke_Load_ReadProperities1.png new file mode 100644 index 0000000000..76da12ef63 Binary files /dev/null and b/website/docs/assets/nuke_Load_ReadProperities1.png differ diff --git a/website/docs/assets/nuke_Load_subsetBrowser.png b/website/docs/assets/nuke_Load_subsetBrowser.png new file mode 100644 index 0000000000..5bfb5bd3eb Binary files /dev/null and b/website/docs/assets/nuke_Load_subsetBrowser.png differ diff --git a/website/docs/assets/nuke_Load_subsetBrowserSubmenu.png b/website/docs/assets/nuke_Load_subsetBrowserSubmenu.png new file mode 100644 index 0000000000..1a157008ee Binary files /dev/null and b/website/docs/assets/nuke_Load_subsetBrowserSubmenu.png differ diff --git a/website/docs/assets/nuke_ManageInventory_read.png b/website/docs/assets/nuke_ManageInventory_read.png new file mode 100644 index 0000000000..8234f27379 Binary files /dev/null and b/website/docs/assets/nuke_ManageInventory_read.png differ diff --git a/website/docs/assets/nuke_ManageInventory_read_latest.png b/website/docs/assets/nuke_ManageInventory_read_latest.png new file mode 100644 index 0000000000..db094c4a26 Binary files /dev/null and b/website/docs/assets/nuke_ManageInventory_read_latest.png differ diff --git a/website/docs/assets/nuke_ManageInventory_read_multipleInstances.png b/website/docs/assets/nuke_ManageInventory_read_multipleInstances.png new file mode 100644 index 0000000000..b5497c010e Binary files /dev/null and b/website/docs/assets/nuke_ManageInventory_read_multipleInstances.png differ diff --git a/website/docs/assets/nuke_ManageInventory_read_outdated.png b/website/docs/assets/nuke_ManageInventory_read_outdated.png new file mode 100644 index 0000000000..87531d1b4d Binary files /dev/null and b/website/docs/assets/nuke_ManageInventory_read_outdated.png differ diff --git a/website/docs/assets/nuke_Publish_prerender.png b/website/docs/assets/nuke_Publish_prerender.png new file mode 100644 index 0000000000..2ab3983db9 Binary files /dev/null and b/website/docs/assets/nuke_Publish_prerender.png differ diff --git a/website/docs/assets/nuke_Workfiles_saveAs.png b/website/docs/assets/nuke_Workfiles_saveAs.png new file mode 100644 index 0000000000..f9562628f2 Binary files /dev/null and b/website/docs/assets/nuke_Workfiles_saveAs.png differ diff --git a/website/docs/assets/nuke_Workfiles_selectLastFile.png b/website/docs/assets/nuke_Workfiles_selectLastFile.png new file mode 100644 index 0000000000..0f98cee0af Binary files /dev/null and b/website/docs/assets/nuke_Workfiles_selectLastFile.png differ diff --git a/website/docs/assets/nuke_applyAllSettings.png b/website/docs/assets/nuke_applyAllSettings.png new file mode 100644 index 0000000000..913140fed1 Binary files /dev/null and b/website/docs/assets/nuke_applyAllSettings.png differ diff --git a/website/docs/assets/nuke_autoBuild.png b/website/docs/assets/nuke_autoBuild.png new file mode 100644 index 0000000000..5effdd594d Binary files /dev/null and b/website/docs/assets/nuke_autoBuild.png differ diff --git a/website/docs/assets/nuke_buildFirstWorkfile.png b/website/docs/assets/nuke_buildFirstWorkfile.png new file mode 100644 index 0000000000..eab8f21a4a Binary files /dev/null and b/website/docs/assets/nuke_buildFirstWorkfile.png differ diff --git a/website/docs/assets/nuke_menu_ApplyAll.png b/website/docs/assets/nuke_menu_ApplyAll.png new file mode 100644 index 0000000000..c9e82b129e Binary files /dev/null and b/website/docs/assets/nuke_menu_ApplyAll.png differ diff --git a/website/docs/assets/nuke_menu_Create.png b/website/docs/assets/nuke_menu_Create.png new file mode 100644 index 0000000000..3823c7d870 Binary files /dev/null and b/website/docs/assets/nuke_menu_Create.png differ diff --git a/website/docs/assets/nuke_menu_Load.png b/website/docs/assets/nuke_menu_Load.png new file mode 100644 index 0000000000..c2ded15e53 Binary files /dev/null and b/website/docs/assets/nuke_menu_Load.png differ diff --git a/website/docs/assets/nuke_menu_Manage.png b/website/docs/assets/nuke_menu_Manage.png new file mode 100644 index 0000000000..71b7abd700 Binary files /dev/null and b/website/docs/assets/nuke_menu_Manage.png differ diff --git a/website/docs/assets/nuke_menu_Publish.png b/website/docs/assets/nuke_menu_Publish.png new file mode 100644 index 0000000000..38be1698b7 Binary files /dev/null and b/website/docs/assets/nuke_menu_Publish.png differ diff --git a/website/docs/assets/nuke_menu_SetContext.png b/website/docs/assets/nuke_menu_SetContext.png new file mode 100644 index 0000000000..83a31f7c7e Binary files /dev/null and b/website/docs/assets/nuke_menu_SetContext.png differ diff --git a/website/docs/assets/nuke_menu_Workfiles.png b/website/docs/assets/nuke_menu_Workfiles.png new file mode 100644 index 0000000000..030ce1b583 Binary files /dev/null and b/website/docs/assets/nuke_menu_Workfiles.png differ diff --git a/website/docs/assets/nuke_publish_renderMain.png b/website/docs/assets/nuke_publish_renderMain.png new file mode 100644 index 0000000000..bb499fb613 Binary files /dev/null and b/website/docs/assets/nuke_publish_renderMain.png differ diff --git a/website/docs/assets/nuke_setColorspace.png b/website/docs/assets/nuke_setColorspace.png new file mode 100644 index 0000000000..8895c30594 Binary files /dev/null and b/website/docs/assets/nuke_setColorspace.png differ diff --git a/website/docs/assets/nuke_setContext.png b/website/docs/assets/nuke_setContext.png new file mode 100644 index 0000000000..b9a6c79f29 Binary files /dev/null and b/website/docs/assets/nuke_setContext.png differ diff --git a/website/docs/assets/nuke_setFrameRanges.png b/website/docs/assets/nuke_setFrameRanges.png new file mode 100644 index 0000000000..0289fc4dba Binary files /dev/null and b/website/docs/assets/nuke_setFrameRanges.png differ diff --git a/website/docs/assets/nuke_setFrameRanges_timeline.png b/website/docs/assets/nuke_setFrameRanges_timeline.png new file mode 100644 index 0000000000..8e6b65c7ca Binary files /dev/null and b/website/docs/assets/nuke_setFrameRanges_timeline.png differ diff --git a/website/docs/assets/nuke_setResolution.png b/website/docs/assets/nuke_setResolution.png new file mode 100644 index 0000000000..3e40619884 Binary files /dev/null and b/website/docs/assets/nuke_setResolution.png differ diff --git a/website/docs/assets/nukestudio_basic_clipNaming.png b/website/docs/assets/nukestudio_basic_clipNaming.png new file mode 100644 index 0000000000..71d623f706 Binary files /dev/null and b/website/docs/assets/nukestudio_basic_clipNaming.png differ diff --git a/website/docs/assets/nukestudio_defaultTags.png b/website/docs/assets/nukestudio_defaultTags.png new file mode 100644 index 0000000000..3ba15ccc17 Binary files /dev/null and b/website/docs/assets/nukestudio_defaultTags.png differ diff --git a/website/docs/assets/nukestudio_lutSucess.png b/website/docs/assets/nukestudio_lutSucess.png new file mode 100644 index 0000000000..fa013b99b2 Binary files /dev/null and b/website/docs/assets/nukestudio_lutSucess.png differ diff --git a/website/docs/assets/nukestudio_publishing_basic.png b/website/docs/assets/nukestudio_publishing_basic.png new file mode 100644 index 0000000000..6592ec423c Binary files /dev/null and b/website/docs/assets/nukestudio_publishing_basic.png differ diff --git a/website/docs/assets/nukestudio_reviewing.png b/website/docs/assets/nukestudio_reviewing.png new file mode 100644 index 0000000000..0d3b4170df Binary files /dev/null and b/website/docs/assets/nukestudio_reviewing.png differ diff --git a/website/docs/assets/nukestudio_setContext.png b/website/docs/assets/nukestudio_setContext.png new file mode 100644 index 0000000000..8c8746a264 Binary files /dev/null and b/website/docs/assets/nukestudio_setContext.png differ diff --git a/website/docs/assets/nukestudio_softEffects.png b/website/docs/assets/nukestudio_softEffects.png new file mode 100644 index 0000000000..13b92801fd Binary files /dev/null and b/website/docs/assets/nukestudio_softEffects.png differ diff --git a/website/docs/assets/nukestudio_tagsToClips_basic.png b/website/docs/assets/nukestudio_tagsToClips_basic.png new file mode 100644 index 0000000000..fadb85342b Binary files /dev/null and b/website/docs/assets/nukestudio_tagsToClips_basic.png differ diff --git a/website/docs/assets/nukestudio_workfiles_openCorrect.png b/website/docs/assets/nukestudio_workfiles_openCorrect.png new file mode 100644 index 0000000000..e097e50d9e Binary files /dev/null and b/website/docs/assets/nukestudio_workfiles_openCorrect.png differ diff --git a/website/docs/assets/nukestudio_workfiles_openingLimit.png b/website/docs/assets/nukestudio_workfiles_openingLimit.png new file mode 100644 index 0000000000..d0e893f4e5 Binary files /dev/null and b/website/docs/assets/nukestudio_workfiles_openingLimit.png differ diff --git a/website/docs/assets/photoshop_creator.PNG b/website/docs/assets/photoshop_creator.PNG new file mode 100644 index 0000000000..e72fe2f447 Binary files /dev/null and b/website/docs/assets/photoshop_creator.PNG differ diff --git a/website/docs/assets/photoshop_extension.PNG b/website/docs/assets/photoshop_extension.PNG new file mode 100644 index 0000000000..ef7081443d Binary files /dev/null and b/website/docs/assets/photoshop_extension.PNG differ diff --git a/website/docs/assets/photoshop_loader.PNG b/website/docs/assets/photoshop_loader.PNG new file mode 100644 index 0000000000..36eeadf084 Binary files /dev/null and b/website/docs/assets/photoshop_loader.PNG differ diff --git a/website/docs/assets/photoshop_loader_load.gif b/website/docs/assets/photoshop_loader_load.gif new file mode 100644 index 0000000000..efe051857b Binary files /dev/null and b/website/docs/assets/photoshop_loader_load.gif differ diff --git a/website/docs/assets/photoshop_manage.PNG b/website/docs/assets/photoshop_manage.PNG new file mode 100644 index 0000000000..64c424d94f Binary files /dev/null and b/website/docs/assets/photoshop_manage.PNG differ diff --git a/website/docs/assets/photoshop_manage_switch.gif b/website/docs/assets/photoshop_manage_switch.gif new file mode 100644 index 0000000000..de11b77e5c Binary files /dev/null and b/website/docs/assets/photoshop_manage_switch.gif differ diff --git a/website/docs/assets/photoshop_manage_update.gif b/website/docs/assets/photoshop_manage_update.gif new file mode 100644 index 0000000000..2c5d681cd3 Binary files /dev/null and b/website/docs/assets/photoshop_manage_update.gif differ diff --git a/website/docs/assets/photoshop_publish.PNG b/website/docs/assets/photoshop_publish.PNG new file mode 100644 index 0000000000..dc57757122 Binary files /dev/null and b/website/docs/assets/photoshop_publish.PNG differ diff --git a/website/docs/assets/photoshop_publish_actions.PNG b/website/docs/assets/photoshop_publish_actions.PNG new file mode 100644 index 0000000000..86083ad54b Binary files /dev/null and b/website/docs/assets/photoshop_publish_actions.PNG differ diff --git a/website/docs/assets/photoshop_publish_expand.PNG b/website/docs/assets/photoshop_publish_expand.PNG new file mode 100644 index 0000000000..6969b15647 Binary files /dev/null and b/website/docs/assets/photoshop_publish_expand.PNG differ diff --git a/website/docs/assets/photoshop_publish_inspect.PNG b/website/docs/assets/photoshop_publish_inspect.PNG new file mode 100644 index 0000000000..d2fd8922af Binary files /dev/null and b/website/docs/assets/photoshop_publish_inspect.PNG differ diff --git a/website/docs/assets/photoshop_publish_repair.gif b/website/docs/assets/photoshop_publish_repair.gif new file mode 100644 index 0000000000..bf7065801e Binary files /dev/null and b/website/docs/assets/photoshop_publish_repair.gif differ diff --git a/website/docs/assets/presets_plugins_extract_burnin_01.png b/website/docs/assets/presets_plugins_extract_burnin_01.png new file mode 100644 index 0000000000..03169c1c88 Binary files /dev/null and b/website/docs/assets/presets_plugins_extract_burnin_01.png differ diff --git a/website/docs/assets/settings/Screenshot_1.png b/website/docs/assets/settings/Screenshot_1.png new file mode 100644 index 0000000000..12c34e8f05 Binary files /dev/null and b/website/docs/assets/settings/Screenshot_1.png differ diff --git a/website/docs/assets/settings/anatomy_01.png b/website/docs/assets/settings/anatomy_01.png new file mode 100644 index 0000000000..92b7e880d6 Binary files /dev/null and b/website/docs/assets/settings/anatomy_01.png differ diff --git a/website/docs/assets/settings/anatomy_roots01.png b/website/docs/assets/settings/anatomy_roots01.png new file mode 100644 index 0000000000..56cda7345b Binary files /dev/null and b/website/docs/assets/settings/anatomy_roots01.png differ diff --git a/website/docs/assets/settings/anatomy_roots02.png b/website/docs/assets/settings/anatomy_roots02.png new file mode 100644 index 0000000000..e55793118f Binary files /dev/null and b/website/docs/assets/settings/anatomy_roots02.png differ diff --git a/website/docs/assets/settings/anatomy_roots03.png b/website/docs/assets/settings/anatomy_roots03.png new file mode 100644 index 0000000000..9c47a189fe Binary files /dev/null and b/website/docs/assets/settings/anatomy_roots03.png differ diff --git a/website/docs/assets/settings/applications_01.png b/website/docs/assets/settings/applications_01.png new file mode 100644 index 0000000000..52c31f6649 Binary files /dev/null and b/website/docs/assets/settings/applications_01.png differ diff --git a/website/docs/assets/settings/colours_01.png b/website/docs/assets/settings/colours_01.png new file mode 100644 index 0000000000..927c6e0a2b Binary files /dev/null and b/website/docs/assets/settings/colours_01.png differ diff --git a/website/docs/assets/settings/colours_02.png b/website/docs/assets/settings/colours_02.png new file mode 100644 index 0000000000..b304fa35f3 Binary files /dev/null and b/website/docs/assets/settings/colours_02.png differ diff --git a/website/docs/assets/settings/override_breadcrumbs.png b/website/docs/assets/settings/override_breadcrumbs.png new file mode 100644 index 0000000000..03eea756ef Binary files /dev/null and b/website/docs/assets/settings/override_breadcrumbs.png differ diff --git a/website/docs/assets/settings/studio_defaults.gif b/website/docs/assets/settings/studio_defaults.gif new file mode 100644 index 0000000000..4825e60501 Binary files /dev/null and b/website/docs/assets/settings/studio_defaults.gif differ diff --git a/website/docs/assets/settings/studio_defaults_remove.gif b/website/docs/assets/settings/studio_defaults_remove.gif new file mode 100644 index 0000000000..cedd9803d4 Binary files /dev/null and b/website/docs/assets/settings/studio_defaults_remove.gif differ diff --git a/website/docs/assets/settings/tools_01.png b/website/docs/assets/settings/tools_01.png new file mode 100644 index 0000000000..9837309994 Binary files /dev/null and b/website/docs/assets/settings/tools_01.png differ diff --git a/website/docs/assets/tools/tools_library_1-small.png b/website/docs/assets/tools/tools_library_1-small.png new file mode 100644 index 0000000000..557b432950 Binary files /dev/null and b/website/docs/assets/tools/tools_library_1-small.png differ diff --git a/website/docs/assets/tools/tools_library_2-small.png b/website/docs/assets/tools/tools_library_2-small.png new file mode 100644 index 0000000000..cf1c6728b0 Binary files /dev/null and b/website/docs/assets/tools/tools_library_2-small.png differ diff --git a/website/docs/assets/tools/tools_loader_1.png b/website/docs/assets/tools/tools_loader_1.png new file mode 100644 index 0000000000..5ec062884d Binary files /dev/null and b/website/docs/assets/tools/tools_loader_1.png differ diff --git a/website/docs/assets/tools/tools_loader_20.png b/website/docs/assets/tools/tools_loader_20.png new file mode 100644 index 0000000000..7bf032d1f9 Binary files /dev/null and b/website/docs/assets/tools/tools_loader_20.png differ diff --git a/website/docs/assets/tools/tools_loader_21.png b/website/docs/assets/tools/tools_loader_21.png new file mode 100644 index 0000000000..b27b2e65b8 Binary files /dev/null and b/website/docs/assets/tools/tools_loader_21.png differ diff --git a/website/docs/assets/tools/tools_loader_22.png b/website/docs/assets/tools/tools_loader_22.png new file mode 100644 index 0000000000..d855568bd8 Binary files /dev/null and b/website/docs/assets/tools/tools_loader_22.png differ diff --git a/website/docs/assets/tools/tools_loader_30-small.png b/website/docs/assets/tools/tools_loader_30-small.png new file mode 100644 index 0000000000..b71add78f1 Binary files /dev/null and b/website/docs/assets/tools/tools_loader_30-small.png differ diff --git a/website/docs/assets/tools/tools_loader_30.png b/website/docs/assets/tools/tools_loader_30.png new file mode 100644 index 0000000000..56f9f89061 Binary files /dev/null and b/website/docs/assets/tools/tools_loader_30.png differ diff --git a/website/docs/assets/tools/tools_loader_4-small.png b/website/docs/assets/tools/tools_loader_4-small.png new file mode 100644 index 0000000000..933da125e4 Binary files /dev/null and b/website/docs/assets/tools/tools_loader_4-small.png differ diff --git a/website/docs/assets/tools/tools_loader_4.png b/website/docs/assets/tools/tools_loader_4.png new file mode 100644 index 0000000000..47f221c4cc Binary files /dev/null and b/website/docs/assets/tools/tools_loader_4.png differ diff --git a/website/docs/assets/tools/tools_loader_40-small.png b/website/docs/assets/tools/tools_loader_40-small.png new file mode 100644 index 0000000000..a352dbf78a Binary files /dev/null and b/website/docs/assets/tools/tools_loader_40-small.png differ diff --git a/website/docs/assets/tools/tools_loader_40.png b/website/docs/assets/tools/tools_loader_40.png new file mode 100644 index 0000000000..b3ad681ce4 Binary files /dev/null and b/website/docs/assets/tools/tools_loader_40.png differ diff --git a/website/docs/assets/tools/tools_loader_41-small.png b/website/docs/assets/tools/tools_loader_41-small.png new file mode 100644 index 0000000000..8f8a27c649 Binary files /dev/null and b/website/docs/assets/tools/tools_loader_41-small.png differ diff --git a/website/docs/assets/tools/tools_loader_41.png b/website/docs/assets/tools/tools_loader_41.png new file mode 100644 index 0000000000..332634fffc Binary files /dev/null and b/website/docs/assets/tools/tools_loader_41.png differ diff --git a/website/docs/assets/tools/tools_loader_5-small.png b/website/docs/assets/tools/tools_loader_5-small.png new file mode 100644 index 0000000000..f2c5d53de1 Binary files /dev/null and b/website/docs/assets/tools/tools_loader_5-small.png differ diff --git a/website/docs/assets/tools/tools_loader_5.png b/website/docs/assets/tools/tools_loader_5.png new file mode 100644 index 0000000000..12eb38a806 Binary files /dev/null and b/website/docs/assets/tools/tools_loader_5.png differ diff --git a/website/docs/assets/tools/tools_loader_50.png b/website/docs/assets/tools/tools_loader_50.png new file mode 100644 index 0000000000..625adbc0a1 Binary files /dev/null and b/website/docs/assets/tools/tools_loader_50.png differ diff --git a/website/docs/assets/tools/tools_scene_inventory_10-small.png b/website/docs/assets/tools/tools_scene_inventory_10-small.png new file mode 100644 index 0000000000..52830b21e4 Binary files /dev/null and b/website/docs/assets/tools/tools_scene_inventory_10-small.png differ diff --git a/website/docs/assets/tools/tools_scene_inventory_20.png b/website/docs/assets/tools/tools_scene_inventory_20.png new file mode 100644 index 0000000000..ec92c4bd69 Binary files /dev/null and b/website/docs/assets/tools/tools_scene_inventory_20.png differ diff --git a/website/docs/assets/tools/tools_scene_inventory_30.png b/website/docs/assets/tools/tools_scene_inventory_30.png new file mode 100644 index 0000000000..27c1b05ffa Binary files /dev/null and b/website/docs/assets/tools/tools_scene_inventory_30.png differ diff --git a/website/docs/assets/tools/tools_scene_inventory_40.png b/website/docs/assets/tools/tools_scene_inventory_40.png new file mode 100644 index 0000000000..c835a0bc42 Binary files /dev/null and b/website/docs/assets/tools/tools_scene_inventory_40.png differ diff --git a/website/docs/assets/tools/tools_scene_inventory_50.png b/website/docs/assets/tools/tools_scene_inventory_50.png new file mode 100644 index 0000000000..282d5267f4 Binary files /dev/null and b/website/docs/assets/tools/tools_scene_inventory_50.png differ diff --git a/website/docs/assets/tools/tools_scene_inventory_54.png b/website/docs/assets/tools/tools_scene_inventory_54.png new file mode 100644 index 0000000000..bf9a034efd Binary files /dev/null and b/website/docs/assets/tools/tools_scene_inventory_54.png differ diff --git a/website/docs/assets/tools/tools_scene_inventory_55.png b/website/docs/assets/tools/tools_scene_inventory_55.png new file mode 100644 index 0000000000..d99dd6eace Binary files /dev/null and b/website/docs/assets/tools/tools_scene_inventory_55.png differ diff --git a/website/docs/assets/tools/tools_scene_inventory_60-small.png b/website/docs/assets/tools/tools_scene_inventory_60-small.png new file mode 100644 index 0000000000..a2ae8f138b Binary files /dev/null and b/website/docs/assets/tools/tools_scene_inventory_60-small.png differ diff --git a/website/docs/assets/tools/tools_scene_inventory_60.png b/website/docs/assets/tools/tools_scene_inventory_60.png new file mode 100644 index 0000000000..6dfd495ed9 Binary files /dev/null and b/website/docs/assets/tools/tools_scene_inventory_60.png differ diff --git a/website/docs/assets/tools/tools_scene_inventory_61-small.png b/website/docs/assets/tools/tools_scene_inventory_61-small.png new file mode 100644 index 0000000000..6edb1da148 Binary files /dev/null and b/website/docs/assets/tools/tools_scene_inventory_61-small.png differ diff --git a/website/docs/assets/tools/tools_scene_inventory_61.png b/website/docs/assets/tools/tools_scene_inventory_61.png new file mode 100644 index 0000000000..b270db3fca Binary files /dev/null and b/website/docs/assets/tools/tools_scene_inventory_61.png differ diff --git a/website/docs/assets/tools/tools_scene_inventory_62-small.png b/website/docs/assets/tools/tools_scene_inventory_62-small.png new file mode 100644 index 0000000000..8623a7c40e Binary files /dev/null and b/website/docs/assets/tools/tools_scene_inventory_62-small.png differ diff --git a/website/docs/assets/tools/tools_scene_inventory_62.png b/website/docs/assets/tools/tools_scene_inventory_62.png new file mode 100644 index 0000000000..122c3a9e25 Binary files /dev/null and b/website/docs/assets/tools/tools_scene_inventory_62.png differ diff --git a/website/docs/assets/tools/tools_scene_inventory_63-small.png b/website/docs/assets/tools/tools_scene_inventory_63-small.png new file mode 100644 index 0000000000..58c8bb4fae Binary files /dev/null and b/website/docs/assets/tools/tools_scene_inventory_63-small.png differ diff --git a/website/docs/assets/tools/tools_scene_inventory_63.png b/website/docs/assets/tools/tools_scene_inventory_63.png new file mode 100644 index 0000000000..5be8c8f70e Binary files /dev/null and b/website/docs/assets/tools/tools_scene_inventory_63.png differ diff --git a/website/docs/assets/tools_context_manager.png b/website/docs/assets/tools_context_manager.png new file mode 100644 index 0000000000..badf7b00bf Binary files /dev/null and b/website/docs/assets/tools_context_manager.png differ diff --git a/website/docs/assets/tools_subset_manager.png b/website/docs/assets/tools_subset_manager.png new file mode 100644 index 0000000000..6a1e48dbd5 Binary files /dev/null and b/website/docs/assets/tools_subset_manager.png differ diff --git a/website/docs/assets/unreal-avalon_tools.jpg b/website/docs/assets/unreal-avalon_tools.jpg new file mode 100644 index 0000000000..531fbe516a Binary files /dev/null and b/website/docs/assets/unreal-avalon_tools.jpg differ diff --git a/website/docs/assets/unreal-container.jpg b/website/docs/assets/unreal-container.jpg new file mode 100644 index 0000000000..f0c0a61e95 Binary files /dev/null and b/website/docs/assets/unreal-container.jpg differ diff --git a/website/docs/assets/workfiles_1.png b/website/docs/assets/workfiles_1.png new file mode 100644 index 0000000000..bcc74fb4b8 Binary files /dev/null and b/website/docs/assets/workfiles_1.png differ diff --git a/website/docs/assets/workfiles_2.png b/website/docs/assets/workfiles_2.png new file mode 100644 index 0000000000..1baf455587 Binary files /dev/null and b/website/docs/assets/workfiles_2.png differ diff --git a/website/docs/changelog.md b/website/docs/changelog.md new file mode 100644 index 0000000000..bec4a02173 --- /dev/null +++ b/website/docs/changelog.md @@ -0,0 +1,1043 @@ +--- +id: changelog +title: Changelog +sidebar_label: Changelog +--- + +## [2.16.0](https://github.com/pypeclub/pype/tree/2.16.0) + + _**release date:** 2021-03-22_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.15.3...2.16.0) + +**Enhancements:** + +- Nuke: deadline submit limit group filter [\#1167](https://github.com/pypeclub/pype/pull/1167) +- Maya: support for Deadline Group and Limit Groups - backport 2.x [\#1156](https://github.com/pypeclub/pype/pull/1156) +- Maya: fixes for Redshift support [\#1152](https://github.com/pypeclub/pype/pull/1152) +- Nuke: adding preset for a Read node name to all img and mov Loaders [\#1146](https://github.com/pypeclub/pype/pull/1146) +- nuke deadline submit with environ var from presets overrides [\#1142](https://github.com/pypeclub/pype/pull/1142) +- Change timers after task change [\#1138](https://github.com/pypeclub/pype/pull/1138) +- Nuke: shortcuts for Pype menu [\#1127](https://github.com/pypeclub/pype/pull/1127) +- Nuke: workfile template [\#1124](https://github.com/pypeclub/pype/pull/1124) +- Sites local settings by site name [\#1117](https://github.com/pypeclub/pype/pull/1117) +- Reset loader's asset selection on context change [\#1106](https://github.com/pypeclub/pype/pull/1106) +- Bulk mov render publishing [\#1101](https://github.com/pypeclub/pype/pull/1101) +- Photoshop: mark publishable instances [\#1093](https://github.com/pypeclub/pype/pull/1093) +- Added ability to define BG color for extract review [\#1088](https://github.com/pypeclub/pype/pull/1088) +- TVPaint extractor enhancement [\#1080](https://github.com/pypeclub/pype/pull/1080) +- Photoshop: added support for .psb in workfiles [\#1078](https://github.com/pypeclub/pype/pull/1078) +- Optionally add task to subset name [\#1072](https://github.com/pypeclub/pype/pull/1072) +- Only extend clip range when collecting. [\#1008](https://github.com/pypeclub/pype/pull/1008) +- Collect audio for farm reviews. [\#1073](https://github.com/pypeclub/pype/pull/1073) + + +**Fixed bugs:** + +- Fix path spaces in jpeg extractor [\#1174](https://github.com/pypeclub/pype/pull/1174) +- Maya: Bugfix: superclass for CreateCameraRig [\#1166](https://github.com/pypeclub/pype/pull/1166) +- Maya: Submit to Deadline - fix typo in condition [\#1163](https://github.com/pypeclub/pype/pull/1163) +- Avoid dot in repre extension [\#1125](https://github.com/pypeclub/pype/pull/1125) +- Fix versions variable usage in standalone publisher [\#1090](https://github.com/pypeclub/pype/pull/1090) +- Collect instance data fix subset query [\#1082](https://github.com/pypeclub/pype/pull/1082) +- Fix getting the camera name. [\#1067](https://github.com/pypeclub/pype/pull/1067) +- Nuke: Ensure "NUKE\_TEMP\_DIR" is not part of the Deadline job environment. [\#1064](https://github.com/pypeclub/pype/pull/1064) + +### [2.15.3](https://github.com/pypeclub/pype/tree/2.15.3) + + _**release date:** 2021-02-26_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.15.2...2.15.3) + +**Enhancements:** + +- Maya: speedup renderable camera collection [\#1053](https://github.com/pypeclub/pype/pull/1053) +- Harmony - add regex search to filter allowed task names for collectin… [\#1047](https://github.com/pypeclub/pype/pull/1047) + +**Fixed bugs:** + +- Ftrack integrate hierarchy fix [\#1085](https://github.com/pypeclub/pype/pull/1085) +- Explicit subset filter in anatomy instance data [\#1059](https://github.com/pypeclub/pype/pull/1059) +- TVPaint frame offset [\#1057](https://github.com/pypeclub/pype/pull/1057) +- Auto fix unicode strings [\#1046](https://github.com/pypeclub/pype/pull/1046) + +### [2.15.2](https://github.com/pypeclub/pype/tree/2.15.2) + + _**release date:** 2021-02-19_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.15.1...2.15.2) + +**Enhancements:** + +- Maya: Vray scene publishing [\#1013](https://github.com/pypeclub/pype/pull/1013) + +**Fixed bugs:** + +- Fix entity move under project [\#1040](https://github.com/pypeclub/pype/pull/1040) +- smaller nuke fixes from production [\#1036](https://github.com/pypeclub/pype/pull/1036) +- TVPaint thumbnail extract fix [\#1031](https://github.com/pypeclub/pype/pull/1031) + +### [2.15.1](https://github.com/pypeclub/pype/tree/2.15.1) + + _**release date:** 2021-02-12_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.15.0...2.15.1) + +**Enhancements:** + +- Delete version as loader action [\#1011](https://github.com/pypeclub/pype/pull/1011) +- Delete old versions [\#445](https://github.com/pypeclub/pype/pull/445) + +**Fixed bugs:** + +- PS - remove obsolete functions from pywin32 [\#1006](https://github.com/pypeclub/pype/pull/1006) +- Clone description of review session objects. [\#922](https://github.com/pypeclub/pype/pull/922) + +## [2.15.0](https://github.com/pypeclub/pype/tree/2.15.0) + + _**release date:** 2021-02-09_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.6...2.15.0) + +**Enhancements:** + +- Resolve - loading and updating clips [\#932](https://github.com/pypeclub/pype/pull/932) +- Release/2.15.0 [\#926](https://github.com/pypeclub/pype/pull/926) +- Photoshop: add option for template.psd and prelaunch hook [\#894](https://github.com/pypeclub/pype/pull/894) +- Nuke: deadline presets [\#993](https://github.com/pypeclub/pype/pull/993) +- Maya: Alembic only set attributes that exists. [\#986](https://github.com/pypeclub/pype/pull/986) +- Harmony: render local and handle fixes [\#981](https://github.com/pypeclub/pype/pull/981) +- PSD Bulk export of ANIM group [\#965](https://github.com/pypeclub/pype/pull/965) +- AE - added prelaunch hook for opening last or workfile from template [\#944](https://github.com/pypeclub/pype/pull/944) +- PS - safer handling of loading of workfile [\#941](https://github.com/pypeclub/pype/pull/941) +- Maya: Handling Arnold referenced AOVs [\#938](https://github.com/pypeclub/pype/pull/938) +- TVPaint: switch layer IDs for layer names during identification [\#903](https://github.com/pypeclub/pype/pull/903) +- TVPaint audio/sound loader [\#893](https://github.com/pypeclub/pype/pull/893) +- Clone review session with children. [\#891](https://github.com/pypeclub/pype/pull/891) +- Simple compositing data packager for freelancers [\#884](https://github.com/pypeclub/pype/pull/884) +- Harmony deadline submission [\#881](https://github.com/pypeclub/pype/pull/881) +- Maya: Optionally hide image planes from reviews. [\#840](https://github.com/pypeclub/pype/pull/840) +- Maya: handle referenced AOVs for Vray [\#824](https://github.com/pypeclub/pype/pull/824) +- DWAA/DWAB support on windows [\#795](https://github.com/pypeclub/pype/pull/795) +- Unreal: animation, layout and setdress updates [\#695](https://github.com/pypeclub/pype/pull/695) + +**Fixed bugs:** + +- Maya: Looks - disable hardlinks [\#995](https://github.com/pypeclub/pype/pull/995) +- Fix Ftrack custom attribute update [\#982](https://github.com/pypeclub/pype/pull/982) +- Prores ks in burnin script [\#960](https://github.com/pypeclub/pype/pull/960) +- terminal.py crash on import [\#839](https://github.com/pypeclub/pype/pull/839) +- Extract review handle bizarre pixel aspect ratio [\#990](https://github.com/pypeclub/pype/pull/990) +- Nuke: add nuke related env var to sumbission [\#988](https://github.com/pypeclub/pype/pull/988) +- Nuke: missing preset's variable [\#984](https://github.com/pypeclub/pype/pull/984) +- Get creator by name fix [\#979](https://github.com/pypeclub/pype/pull/979) +- Fix update of project's tasks on Ftrack sync [\#972](https://github.com/pypeclub/pype/pull/972) +- nuke: wrong frame offset in mov loader [\#971](https://github.com/pypeclub/pype/pull/971) +- Create project structure action fix multiroot [\#967](https://github.com/pypeclub/pype/pull/967) +- PS: remove pywin installation from hook [\#964](https://github.com/pypeclub/pype/pull/964) +- Prores ks in burnin script [\#959](https://github.com/pypeclub/pype/pull/959) +- Subset family is now stored in subset document [\#956](https://github.com/pypeclub/pype/pull/956) +- DJV new version arguments [\#954](https://github.com/pypeclub/pype/pull/954) +- TV Paint: Fix single frame Sequence [\#953](https://github.com/pypeclub/pype/pull/953) +- nuke: missing `file` knob update [\#933](https://github.com/pypeclub/pype/pull/933) +- Photoshop: Create from single layer was failing [\#920](https://github.com/pypeclub/pype/pull/920) +- Nuke: baking mov with correct colorspace inherited from write [\#909](https://github.com/pypeclub/pype/pull/909) +- Launcher fix actions discover [\#896](https://github.com/pypeclub/pype/pull/896) +- Get the correct file path for the updated mov. [\#889](https://github.com/pypeclub/pype/pull/889) +- Maya: Deadline submitter - shared data access violation [\#831](https://github.com/pypeclub/pype/pull/831) +- Maya: Take into account vray master AOV switch [\#822](https://github.com/pypeclub/pype/pull/822) + +**Merged pull requests:** + +- Refactor blender to 3.0 format [\#934](https://github.com/pypeclub/pype/pull/934) + +### [2.14.6](https://github.com/pypeclub/pype/tree/2.14.6) + + _**release date:** 2021-01-15_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.5...2.14.6) + +**Fixed bugs:** + +- Nuke: improving of hashing path [\#885](https://github.com/pypeclub/pype/pull/885) + +**Merged pull requests:** + +- Hiero: cut videos with correct secons [\#892](https://github.com/pypeclub/pype/pull/892) +- Faster sync to avalon preparation [\#869](https://github.com/pypeclub/pype/pull/869) + +### [2.14.5](https://github.com/pypeclub/pype/tree/2.14.5) + + _**release date:** 2021-01-06_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.4...2.14.5) + +**Merged pull requests:** + +- Pype logger refactor [\#866](https://github.com/pypeclub/pype/pull/866) + +### [2.14.4](https://github.com/pypeclub/pype/tree/2.14.4) + + _**release date:** 2020-12-18_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.3...2.14.4) + +**Merged pull requests:** + +- Fix - AE - added explicit cast to int [\#837](https://github.com/pypeclub/pype/pull/837) + +### [2.14.3](https://github.com/pypeclub/pype/tree/2.14.3) + + _**release date:** 2020-12-16_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.2...2.14.3) + +**Fixed bugs:** + +- TVPaint repair invalid metadata [\#809](https://github.com/pypeclub/pype/pull/809) +- Feature/push hier value to nonhier action [\#807](https://github.com/pypeclub/pype/pull/807) +- Harmony: fix palette and image sequence loader [\#806](https://github.com/pypeclub/pype/pull/806) + +**Merged pull requests:** + +- respecting space in path [\#823](https://github.com/pypeclub/pype/pull/823) + +### [2.14.2](https://github.com/pypeclub/pype/tree/2.14.2) + + _**release date:** 2020-12-04_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.1...2.14.2) + +**Enhancements:** + +- Collapsible wrapper in settings [\#767](https://github.com/pypeclub/pype/pull/767) + +**Fixed bugs:** + +- Harmony: template extraction and palettes thumbnails on mac [\#768](https://github.com/pypeclub/pype/pull/768) +- TVPaint store context to workfile metadata \(764\) [\#766](https://github.com/pypeclub/pype/pull/766) +- Extract review audio cut fix [\#763](https://github.com/pypeclub/pype/pull/763) + +**Merged pull requests:** + +- AE: fix publish after background load [\#781](https://github.com/pypeclub/pype/pull/781) +- TVPaint store members key [\#769](https://github.com/pypeclub/pype/pull/769) + +### [2.14.1](https://github.com/pypeclub/pype/tree/2.14.1) + + _**release date:** 2020-11-27_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.14.0...2.14.1) + +**Enhancements:** + +- Settings required keys in modifiable dict [\#770](https://github.com/pypeclub/pype/pull/770) +- Extract review may not add audio to output [\#761](https://github.com/pypeclub/pype/pull/761) + +**Fixed bugs:** + +- After Effects: frame range, file format and render source scene fixes [\#760](https://github.com/pypeclub/pype/pull/760) +- Hiero: trimming review with clip event number [\#754](https://github.com/pypeclub/pype/pull/754) +- TVPaint: fix updating of loaded subsets [\#752](https://github.com/pypeclub/pype/pull/752) +- Maya: Vray handling of default aov [\#748](https://github.com/pypeclub/pype/pull/748) +- Maya: multiple renderable cameras in layer didn't work [\#744](https://github.com/pypeclub/pype/pull/744) +- Ftrack integrate custom attributes fix [\#742](https://github.com/pypeclub/pype/pull/742) + + + +## [2.14.0](https://github.com/pypeclub/pype/tree/2.14.0) + + _**release date:** 2020-11-24_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.13.7...2.14.0) + +**Enhancements:** + +- Ftrack: Event for syncing shot or asset status with tasks.[\#736](https://github.com/pypeclub/pype/pull/736) +- Maya: add camera rig publishing option [\#721](https://github.com/pypeclub/pype/pull/721) +- Maya: Ask user to select non-default camera from scene or create a new. [\#678](https://github.com/pypeclub/pype/pull/678) +- Maya: Camera name can be added to burnins. [\#674](https://github.com/pypeclub/pype/pull/674) +- Sort instances by label in pyblish gui [\#719](https://github.com/pypeclub/pype/pull/719) +- Synchronize ftrack hierarchical and shot attributes [\#716](https://github.com/pypeclub/pype/pull/716) +- Standalone Publisher: Publish editorial from separate image sequences [\#699](https://github.com/pypeclub/pype/pull/699) +- Render publish plugins abstraction [\#687](https://github.com/pypeclub/pype/pull/687) +- TV Paint: image loader with options [\#675](https://github.com/pypeclub/pype/pull/675) +- **TV Paint (Beta):** initial implementation of creators and local rendering [\#693](https://github.com/pypeclub/pype/pull/693) +- **After Effects (Beta):** base integration with loaders [\#667](https://github.com/pypeclub/pype/pull/667) +- Harmony: Javascript refactoring and overall stability improvements [\#666](https://github.com/pypeclub/pype/pull/666) + +**Fixed bugs:** + +- TVPaint: extract review fix [\#740](https://github.com/pypeclub/pype/pull/740) +- After Effects: Review were not being sent to ftrack [\#738](https://github.com/pypeclub/pype/pull/738) +- Maya: vray proxy was not loading [\#722](https://github.com/pypeclub/pype/pull/722) +- Maya: Vray expected file fixes [\#682](https://github.com/pypeclub/pype/pull/682) + +**Deprecated:** + +- Removed artist view from pyblish gui [\#717](https://github.com/pypeclub/pype/pull/717) +- Maya: disable legacy override check for cameras [\#715](https://github.com/pypeclub/pype/pull/715) + + + + +### [2.13.7](https://github.com/pypeclub/pype/tree/2.13.7) + + _**release date:** 2020-11-19_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.13.6...2.13.7) + +**Merged pull requests:** + +- fix\(SP\): getting fps from context instead of nonexistent entity [\#729](https://github.com/pypeclub/pype/pull/729) + + + + +### [2.13.6](https://github.com/pypeclub/pype/tree/2.13.6) + + _**release date:** 2020-11-15_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.13.5...2.13.6) + +**Fixed bugs:** + +- Maya workfile version wasn't syncing with renders properly [\#711](https://github.com/pypeclub/pype/pull/711) +- Maya: Fix for publishing multiple cameras with review from the same scene [\#710](https://github.com/pypeclub/pype/pull/710) + + + + +### [2.13.5](https://github.com/pypeclub/pype/tree/2.13.5) + + _**release date:** 2020-11-12_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.13.4...2.13.5) + + +**Fixed bugs:** + +- Wrong thumbnail file was picked when publishing sequence in standalone publisher [\#703](https://github.com/pypeclub/pype/pull/703) +- Fix: Burnin data pass and FFmpeg tool check [\#701](https://github.com/pypeclub/pype/pull/701) + + + + +### [2.13.4](https://github.com/pypeclub/pype/tree/2.13.4) + + _**release date:** 2020-11-09_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.13.3...2.13.4) + + +**Fixed bugs:** + +- Photoshop unhiding hidden layers [\#688](https://github.com/pypeclub/pype/issues/688) +- Nuke: Favorite directories "shot dir" "project dir" - not working \#684 [\#685](https://github.com/pypeclub/pype/pull/685) + + + + + +### [2.13.3](https://github.com/pypeclub/pype/tree/2.13.3) + + _**release date:** _2020-11-03_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.13.2...2.13.3) + +**Fixed bugs:** + +- Fix ffmpeg executable path with spaces [\#680](https://github.com/pypeclub/pype/pull/680) +- Hotfix: Added default version number [\#679](https://github.com/pypeclub/pype/pull/679) + + + + +### [2.13.2](https://github.com/pypeclub/pype/tree/2.13.2) + + _**release date:** 2020-10-28_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.13.1...2.13.2) + +**Fixed bugs:** + +- Nuke: wrong conditions when fixing legacy write nodes [\#665](https://github.com/pypeclub/pype/pull/665) + + + + +### [2.13.1](https://github.com/pypeclub/pype/tree/2.13.1) + + _**release date:** 2020-10-23_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.13.0...2.13.1) + +**Fixed bugs:** + +- Photoshop: Layer name is not propagating to metadata [\#654](https://github.com/pypeclub/pype/issues/654) +- Photoshop: Loader in fails with "can't set attribute" [\#650](https://github.com/pypeclub/pype/issues/650) +- Hiero: Review video file adding one frame to the end [\#659](https://github.com/pypeclub/pype/issues/659) + + + +## [2.13.0](https://github.com/pypeclub/pype/tree/2.13.0) + + _**release date:** 2020-10-16_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.12.5...2.13.0) + +**Enhancements:** + +- Deadline Output Folder [\#636](https://github.com/pypeclub/pype/issues/636) +- Nuke Camera Loader [\#565](https://github.com/pypeclub/pype/issues/565) +- Deadline publish job shows publishing output folder [\#649](https://github.com/pypeclub/pype/pull/649) +- Get latest version in lib [\#642](https://github.com/pypeclub/pype/pull/642) +- Improved publishing of multiple representation from SP [\#638](https://github.com/pypeclub/pype/pull/638) +- TvPaint: launch shot work file from within Ftrack [\#631](https://github.com/pypeclub/pype/pull/631) +- Add mp4 support for RV action. [\#628](https://github.com/pypeclub/pype/pull/628) +- Maya: allow renders to have version synced with workfile [\#618](https://github.com/pypeclub/pype/pull/618) +- Renaming nukestudio host folder to hiero [\#617](https://github.com/pypeclub/pype/pull/617) +- Harmony: More efficient publishing [\#615](https://github.com/pypeclub/pype/pull/615) +- Ftrack server action improvement [\#608](https://github.com/pypeclub/pype/pull/608) +- Deadline user defaults to pype username if present [\#607](https://github.com/pypeclub/pype/pull/607) +- Standalone publisher now has icon [\#606](https://github.com/pypeclub/pype/pull/606) +- Nuke render write targeting knob improvement [\#603](https://github.com/pypeclub/pype/pull/603) +- Animated pyblish gui [\#602](https://github.com/pypeclub/pype/pull/602) +- Maya: Deadline - make use of asset dependencies optional [\#591](https://github.com/pypeclub/pype/pull/591) +- Nuke: Publishing, loading and updating alembic cameras [\#575](https://github.com/pypeclub/pype/pull/575) +- Maya: add look assigner to pype menu even if scriptsmenu is not available [\#573](https://github.com/pypeclub/pype/pull/573) +- Store task types in the database [\#572](https://github.com/pypeclub/pype/pull/572) +- Maya: Tiled EXRs to scanline EXRs render option [\#512](https://github.com/pypeclub/pype/pull/512) +- Fusion: basic integration refresh [\#452](https://github.com/pypeclub/pype/pull/452) + +**Fixed bugs:** + +- Burnin script did not propagate ffmpeg output [\#640](https://github.com/pypeclub/pype/issues/640) +- Pyblish-pype spacer in terminal wasn't transparent [\#646](https://github.com/pypeclub/pype/pull/646) +- Lib subprocess without logger [\#645](https://github.com/pypeclub/pype/pull/645) +- Nuke: prevent crash if we only have single frame in sequence [\#644](https://github.com/pypeclub/pype/pull/644) +- Burnin script logs better output [\#641](https://github.com/pypeclub/pype/pull/641) +- Missing audio on farm submission. [\#639](https://github.com/pypeclub/pype/pull/639) +- review from imagesequence error [\#633](https://github.com/pypeclub/pype/pull/633) +- Hiero: wrong order of fps clip instance data collecting [\#627](https://github.com/pypeclub/pype/pull/627) +- Add source for review instances. [\#625](https://github.com/pypeclub/pype/pull/625) +- Task processing in event sync [\#623](https://github.com/pypeclub/pype/pull/623) +- sync to avalon doesn t remove renamed task [\#619](https://github.com/pypeclub/pype/pull/619) +- Intent publish setting wasn't working with default value [\#562](https://github.com/pypeclub/pype/pull/562) +- Maya: Updating a look where the shader name changed, leaves the geo without a shader [\#514](https://github.com/pypeclub/pype/pull/514) + + +### [2.12.5](https://github.com/pypeclub/pype/tree/2.12.5) + +_**release date:** 2020-10-14_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.12.4...2.12.5) + +**Fixed Bugs:** + +- Harmony: Disable application launch logic [\#637](https://github.com/pypeclub/pype/pull/637) + +### [2.12.4](https://github.com/pypeclub/pype/tree/2.12.4) + +_**release date:** 2020-10-08_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.12.3...2.12.4) + +**Fixed bugs:** + +- Sync to avalon doesn't remove renamed task [\#605](https://github.com/pypeclub/pype/issues/605) + + +**Merged pull requests:** + +- NukeStudio: small fixes [\#622](https://github.com/pypeclub/pype/pull/622) +- NukeStudio: broken order of plugins [\#620](https://github.com/pypeclub/pype/pull/620) + +### [2.12.3](https://github.com/pypeclub/pype/tree/2.12.3) + +_**release date:** 2020-10-06_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.12.2...2.12.3) + +**Fixed bugs:** + +- Harmony: empty scene contamination [\#583](https://github.com/pypeclub/pype/issues/583) +- Edit publishing in SP doesn't respect shot selection for publishing [\#542](https://github.com/pypeclub/pype/issues/542) +- Pathlib breaks compatibility with python2 hosts [\#281](https://github.com/pypeclub/pype/issues/281) +- Maya: fix maya scene type preset exception [\#569](https://github.com/pypeclub/pype/pull/569) +- Standalone publisher editorial plugins interfering [\#580](https://github.com/pypeclub/pype/pull/580) + +### [2.12.2](https://github.com/pypeclub/pype/tree/2.12.2) + +_**release date:** 2020-09-25_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.12.1...2.12.2) + +**Fixed bugs:** + +- Harmony: Saving heavy scenes will crash [\#507](https://github.com/pypeclub/pype/issues/507) +- Extract review a representation name with `\*\_burnin` [\#388](https://github.com/pypeclub/pype/issues/388) +- Hierarchy data was not considering active instances [\#551](https://github.com/pypeclub/pype/pull/551) + +### [2.12.1](https://github.com/pypeclub/pype/tree/2.12.1) + +_**release date:** 2020-09-15_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.12.0...2.12.1) + +**Fixed bugs:** + +- dependency security alert ! [\#484](https://github.com/pypeclub/pype/issues/484) +- Maya: RenderSetup is missing update [\#106](https://github.com/pypeclub/pype/issues/106) +- \ extract effects creates new instance [\#78](https://github.com/pypeclub/pype/issues/78) + + + + +## [2.12.0](https://github.com/pypeclub/pype/tree/2.12.0) ## + +_**release date:** 09 Sept 2020_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.11.8...2.12.0) + +**Enhancements:** + +- Pype now uses less mongo connections [\#509](https://github.com/pypeclub/pype/pull/509) +- Nuke: adding image loader [\#499](https://github.com/pypeclub/pype/pull/499) +- Completely new application launcher [\#443](https://github.com/pypeclub/pype/pull/443) +- Maya: Optional skip review on renders. [\#441](https://github.com/pypeclub/pype/pull/441) +- Ftrack: Option to push status from task to latest version [\#440](https://github.com/pypeclub/pype/pull/440) +- Maya: Properly containerize image plane loads. [\#434](https://github.com/pypeclub/pype/pull/434) +- Option to keep the review files. [\#426](https://github.com/pypeclub/pype/pull/426) +- Maya: Isolate models during preview publishing [\#425](https://github.com/pypeclub/pype/pull/425) +- Ftrack attribute group is backwards compatible [\#418](https://github.com/pypeclub/pype/pull/418) +- Maya: Publishing of tile renderings on Deadline [\#398](https://github.com/pypeclub/pype/pull/398) +- Slightly better logging gui [\#383](https://github.com/pypeclub/pype/pull/383) +- Standalonepublisher: editorial family features expansion [\#411](https://github.com/pypeclub/pype/pull/411) + +**Fixed bugs:** + +- Maya: Fix tile order for Draft Tile Assembler [\#511](https://github.com/pypeclub/pype/pull/511) +- Remove extra dash [\#501](https://github.com/pypeclub/pype/pull/501) +- Fix: strip dot from repre names in single frame renders [\#498](https://github.com/pypeclub/pype/pull/498) +- Better handling of destination during integrating [\#485](https://github.com/pypeclub/pype/pull/485) +- Fix: allow thumbnail creation for single frame renders [\#460](https://github.com/pypeclub/pype/pull/460) +- added missing argument to launch\_application in ftrack app handler [\#453](https://github.com/pypeclub/pype/pull/453) +- Burnins: Copy bit rate of input video to match quality. [\#448](https://github.com/pypeclub/pype/pull/448) +- Standalone publisher is now independent from tray [\#442](https://github.com/pypeclub/pype/pull/442) +- Bugfix/empty enumerator attributes [\#436](https://github.com/pypeclub/pype/pull/436) +- Fixed wrong order of "other" category collapssing in publisher [\#435](https://github.com/pypeclub/pype/pull/435) +- Multiple reviews where being overwritten to one. [\#424](https://github.com/pypeclub/pype/pull/424) +- Cleanup plugin fail on instances without staging dir [\#420](https://github.com/pypeclub/pype/pull/420) +- deprecated -intra parameter in ffmpeg to new `-g` [\#417](https://github.com/pypeclub/pype/pull/417) +- Delivery action can now work with entered path [\#397](https://github.com/pypeclub/pype/pull/397) + + + + + +### [2.11.8](https://github.com/pypeclub/pype/tree/2.11.8) ## + +_**release date:** 27 Aug 2020_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.11.7...2.11.8) + +**Fixed bugs:** + +- pyblish pype - other group is collapsed before plugins are done [\#431](https://github.com/pypeclub/pype/issues/431) +- Alpha white edges in harmony on PNGs [\#412](https://github.com/pypeclub/pype/issues/412) +- harmony image loader picks wrong representations [\#404](https://github.com/pypeclub/pype/issues/404) +- Clockify crash when response contain symbol not allowed by UTF-8 [\#81](https://github.com/pypeclub/pype/issues/81) + + + + +### [2.11.7](https://github.com/pypeclub/pype/tree/2.11.7) ## + +_**release date:** 21 Aug 2020_ + + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.11.6...2.11.7) + +**Fixed bugs:** + +- Clean Up Baked Movie [\#369](https://github.com/pypeclub/pype/issues/369) +- celaction last workfile wasn't picked up correctly [\#459](https://github.com/pypeclub/pype/pull/459) + + + +### [2.11.5](https://github.com/pypeclub/pype/tree/2.11.5) ## + +_**release date:** 13 Aug 2020_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.11.4...2.11.5) + +**Enhancements:** + +- Standalone publisher now only groups sequence if the extension is known [\#439](https://github.com/pypeclub/pype/pull/439) + +**Fixed bugs:** + +- Logs have been disable for editorial by default to speed up publishing [\#433](https://github.com/pypeclub/pype/pull/433) +- Various fixes for celaction [\#430](https://github.com/pypeclub/pype/pull/430) +- Harmony: invalid variable scope in validate scene settings [\#428](https://github.com/pypeclub/pype/pull/428) +- Harmomny: new representation name for audio was not accepted [\#427](https://github.com/pypeclub/pype/pull/427) + + + + +### [2.11.3](https://github.com/pypeclub/pype/tree/2.11.3) ## + +_**release date:** 4 Aug 2020_ + +[Full Changelog](https://github.com/pypeclub/pype/compare/2.11.2...2.11.3) + +**Fixed bugs:** + +- Harmony: publishing performance issues [\#408](https://github.com/pypeclub/pype/pull/408) + + + + +## 2.11.0 ## + +_**release date:** 27 July 2020_ + +**new:** +- _(blender)_ namespace support [\#341](https://github.com/pypeclub/pype/pull/341) +- _(blender)_ start end frames [\#330](https://github.com/pypeclub/pype/pull/330) +- _(blender)_ camera asset [\#322](https://github.com/pypeclub/pype/pull/322) +- _(pype)_ toggle instances per family in pyblish GUI [\#320](https://github.com/pypeclub/pype/pull/320) +- _(pype)_ current release version is now shown in the tray menu [#379](https://github.com/pypeclub/pype/pull/379) + + +**improved:** +- _(resolve)_ tagging for publish [\#239](https://github.com/pypeclub/pype/issues/239) +- _(pype)_ Support publishing a subset of shots with standalone editorial [\#336](https://github.com/pypeclub/pype/pull/336) +- _(harmony)_ Basic support for palettes [\#324](https://github.com/pypeclub/pype/pull/324) +- _(photoshop)_ Flag outdated containers on startup and publish. [\#309](https://github.com/pypeclub/pype/pull/309) +- _(harmony)_ Flag Outdated containers [\#302](https://github.com/pypeclub/pype/pull/302) +- _(photoshop)_ Publish review [\#298](https://github.com/pypeclub/pype/pull/298) +- _(pype)_ Optional Last workfile launch [\#365](https://github.com/pypeclub/pype/pull/365) + + +**fixed:** +- _(premiere)_ workflow fixes [\#346](https://github.com/pypeclub/pype/pull/346) +- _(pype)_ pype-setup does not work with space in path [\#327](https://github.com/pypeclub/pype/issues/327) +- _(ftrack)_ Ftrack delete action cause circular error [\#206](https://github.com/pypeclub/pype/issues/206) +- _(nuke)_ Priority was forced to 50 [\#345](https://github.com/pypeclub/pype/pull/345) +- _(nuke)_ Fix ValidateNukeWriteKnobs [\#340](https://github.com/pypeclub/pype/pull/340) +- _(maya)_ If camera attributes are connected, we can ignore them. [\#339](https://github.com/pypeclub/pype/pull/339) +- _(pype)_ stop appending of tools environment to existing env [\#337](https://github.com/pypeclub/pype/pull/337) +- _(ftrack)_ Ftrack timeout needs to look at AVALON\_TIMEOUT [\#325](https://github.com/pypeclub/pype/pull/325) +- _(harmony)_ Only zip files are supported. [\#310](https://github.com/pypeclub/pype/pull/310) +- _(pype)_ hotfix/Fix event server mongo uri [\#305](https://github.com/pypeclub/pype/pull/305) +- _(photoshop)_ Subset was not named or validated correctly. [\#304](https://github.com/pypeclub/pype/pull/304) + + + + + +## 2.10.0 ## + +_**release date:** 17 June 2020_ + +**new:** +- _(harmony)_ **Toon Boom Harmony** has been greatly extended to support rigging, scene build, animation and rendering workflows. [#270](https://github.com/pypeclub/pype/issues/270) [#271](https://github.com/pypeclub/pype/issues/271) [#190](https://github.com/pypeclub/pype/issues/190) [#191](https://github.com/pypeclub/pype/issues/191) [#172](https://github.com/pypeclub/pype/issues/172) [#168](https://github.com/pypeclub/pype/issues/168) +- _(pype)_ Added support for rudimentary **edl publishing** into individual shots. [#265](https://github.com/pypeclub/pype/issues/265) +- _(celaction)_ Simple **Celaction** integration has been added with support for workfiles and rendering. [#255](https://github.com/pypeclub/pype/issues/255) +- _(maya)_ Support for multiple job types when submitting to the farm. We can now render Maya or Standalone render jobs for Vray and Arnold (limited support for arnold) [#204](https://github.com/pypeclub/pype/issues/204) +- _(photoshop)_ Added initial support for Photoshop [#232](https://github.com/pypeclub/pype/issues/232) + +**improved:** +- _(blender)_ Updated support for rigs and added support Layout family [#233](https://github.com/pypeclub/pype/issues/233) [#226](https://github.com/pypeclub/pype/issues/226) +- _(premiere)_ It is now possible to choose different storage root for workfiles of different task types. [#255](https://github.com/pypeclub/pype/issues/255) +- _(maya)_ Support for unmerged AOVs in Redshift multipart EXRs [#197](https://github.com/pypeclub/pype/issues/197) +- _(pype)_ Pype repository has been refactored in preparation for 3.0 release [#169](https://github.com/pypeclub/pype/issues/169) +- _(deadline)_ All file dependencies are now passed to deadline from maya to prevent premature start of rendering if caches or textures haven't been coppied over yet. [#195](https://github.com/pypeclub/pype/issues/195) +- _(nuke)_ Script validation can now be made optional. [#194](https://github.com/pypeclub/pype/issues/194) +- _(pype)_ Publishing can now be stopped at any time. [#194](https://github.com/pypeclub/pype/issues/194) + +**fix:** +- _(pype)_ Pyblish-lite has been integrated into pype repository, plus various publishing GUI fixes. [#274](https://github.com/pypeclub/pype/issues/274) [#275](https://github.com/pypeclub/pype/issues/275) [#268](https://github.com/pypeclub/pype/issues/268) [#227](https://github.com/pypeclub/pype/issues/227) [#238](https://github.com/pypeclub/pype/issues/238) +- _(maya)_ Alembic extractor was getting wrong frame range type in certain scenarios [#254](https://github.com/pypeclub/pype/issues/254) +- _(maya)_ Attaching a render to subset in maya was not passing validation in certain scenarios [#256](https://github.com/pypeclub/pype/issues/256) +- _(ftrack)_ Various small fixes to ftrack sync [#263](https://github.com/pypeclub/pype/issues/263) [#259](https://github.com/pypeclub/pype/issues/259) +- _(maya)_ Look extraction is now able to skp invalid connections in shaders [#207](https://github.com/pypeclub/pype/issues/207) + + + + + +## 2.9.0 ## + +_**release date:** 25 May 2020_ + +**new:** +- _(pype)_ Support for **Multiroot projects**. You can now store project data on multiple physical or virtual storages and target individual publishes to these locations. For instance render can be stored on a faster storage than the rest of the project. [#145](https://github.com/pypeclub/pype/issues/145), [#38](https://github.com/pypeclub/pype/issues/38) +- _(harmony)_ Basic implementation of **Toon Boom Harmony** has been added. [#142](https://github.com/pypeclub/pype/issues/142) +- _(pype)_ OSX support is in public beta now. There are issues to be expected, but the main implementation should be functional. [#141](https://github.com/pypeclub/pype/issues/141) + + +**improved:** + +- _(pype)_ **Review extractor** has been completely rebuilt. It now supports granular filtering so you can create **multiple outputs** for different tasks, families or hosts. [#103](https://github.com/pypeclub/pype/issues/103), [#166](https://github.com/pypeclub/pype/issues/166), [#165](https://github.com/pypeclub/pype/issues/165) +- _(pype)_ **Burnin** generation had been extended to **support same multi-output filtering** as review extractor [#103](https://github.com/pypeclub/pype/issues/103) +- _(pype)_ Publishing file templates can now be specified in config for each individual family [#114](https://github.com/pypeclub/pype/issues/114) +- _(pype)_ Studio specific plugins can now be appended to pype standard publishing plugins. [#112](https://github.com/pypeclub/pype/issues/112) +- _(nukestudio)_ Reviewable clips no longer need to be previously cut, exported and re-imported to timeline. **Pype can now dynamically cut reviewable quicktimes** from continuous offline footage during publishing. [#23](https://github.com/pypeclub/pype/issues/23) +- _(deadline)_ Deadline can now correctly differentiate between staging and production pype. [#154](https://github.com/pypeclub/pype/issues/154) +- _(deadline)_ `PYPE_PYTHON_EXE` env variable can now be used to direct publishing to explicit python installation. [#120](https://github.com/pypeclub/pype/issues/120) +- _(nuke)_ Nuke now check for new version of loaded data on file open. [#140](https://github.com/pypeclub/pype/issues/140) +- _(nuke)_ frame range and limit checkboxes are now exposed on write node. [#119](https://github.com/pypeclub/pype/issues/119) + + + +**fix:** + +- _(nukestudio)_ Project Location was using backslashes which was breaking nukestudio native exporting in certains configurations [#82](https://github.com/pypeclub/pype/issues/82) +- _(nukestudio)_ Duplicity in hierarchy tags was prone to throwing publishing error [#130](https://github.com/pypeclub/pype/issues/130), [#144](https://github.com/pypeclub/pype/issues/144) +- _(ftrack)_ multiple stability improvements [#157](https://github.com/pypeclub/pype/issues/157), [#159](https://github.com/pypeclub/pype/issues/159), [#128](https://github.com/pypeclub/pype/issues/128), [#118](https://github.com/pypeclub/pype/issues/118), [#127](https://github.com/pypeclub/pype/issues/127) +- _(deadline)_ multipart EXRs were stopping review publishing on the farm. They are still not supported for automatic review generation, but the publish will go through correctly without the quicktime. [#155](https://github.com/pypeclub/pype/issues/155) +- _(deadline)_ If deadline is non-responsive it will no longer freeze host when publishing [#149](https://github.com/pypeclub/pype/issues/149) +- _(deadline)_ Sometimes deadline was trying to launch render before all the source data was coppied over. [#137](https://github.com/pypeclub/pype/issues/137) _(harmony)_ Basic implementation of **Toon Boom Harmony** has been added. [#142](https://github.com/pypeclub/pype/issues/142) +- _(nuke)_ Filepath knob wasn't updated properly. [#131](https://github.com/pypeclub/pype/issues/131) +- _(maya)_ When extracting animation, the "Write Color Set" options on the instance were not respected. [#108](https://github.com/pypeclub/pype/issues/108) +- _(maya)_ Attribute overrides for AOV only worked for the legacy render layers. Now it works for new render setup as well [#132](https://github.com/pypeclub/pype/issues/132) +- _(maya)_ Stability and usability improvements in yeti workflow [#104](https://github.com/pypeclub/pype/issues/104) + + + + + +## 2.8.0 ## + +_**release date:** 20 April 2020_ + +**new:** + +- _(pype)_ Option to generate slates from json templates. [PYPE-628] [#26](https://github.com/pypeclub/pype/issues/26) +- _(pype)_ It is now possible to automate loading of published subsets into any scene. Documentation will follow :). [PYPE-611] [#24](https://github.com/pypeclub/pype/issues/24) + +**fix:** + +- _(maya)_ Some Redshift render tokens could break publishing. [PYPE-778] [#33](https://github.com/pypeclub/pype/issues/33) +- _(maya)_ Publish was not preserving maya file extension. [#39](https://github.com/pypeclub/pype/issues/39) +- _(maya)_ Rig output validator was failing on nodes without shapes. [#40](https://github.com/pypeclub/pype/issues/40) +- _(maya)_ Yeti caches can now be properly versioned up in the scene inventory. [#40](https://github.com/pypeclub/pype/issues/40) +- _(nuke)_ Build first workfiles was not accepting jpeg sequences. [#34](https://github.com/pypeclub/pype/issues/34) +- _(deadline)_ Trying to generate ffmpeg review from multipart EXRs no longer crashes publishing. [PYPE-781] +- _(deadline)_ Render publishing is more stable in multiplatform environments. [PYPE-775] + + + + + +## 2.7.0 ## + +_**release date:** 30 March 2020_ + +**new:** + +- _(maya)_ Artist can now choose to load multiple references of the same subset at once [PYPE-646, PYPS-81] +- _(nuke)_ Option to use named OCIO colorspaces for review colour baking. [PYPS-82] +- _(pype)_ Pype can now work with `master` versions for publishing and loading. These are non-versioned publishes that are overwritten with the latest version during publish. These are now supported in all the GUIs, but their publishing is deactivated by default. [PYPE-653] +- _(blender)_ Added support for basic blender workflow. We currently support `rig`, `model` and `animation` families. [PYPE-768] +- _(pype)_ Source timecode can now be used in burn-ins. [PYPE-777] +- _(pype)_ Review outputs profiles can now specify delivery resolution different than project setting [PYPE-759] +- _(nuke)_ Bookmark to current context is now added automatically to all nuke browser windows. [PYPE-712] + +**change:** + +- _(maya)_ It is now possible to publish camera without. baking. Keep in mind that unbaked cameras can't be guaranteed to work in other hosts. [PYPE-595] +- _(maya)_ All the renders from maya are now grouped in the loader by their Layer name. [PYPE-482] +- _(nuke/hiero)_ Any publishes from nuke and hiero can now be versioned independently of the workfile. [PYPE-728] + + +**fix:** + +- _(nuke)_ Mixed slashes caused issues in ocio config path. +- _(pype)_ Intent field in pyblish GUI was passing label instead of value to ftrack. [PYPE-733] +- _(nuke)_ Publishing of pre-renders was inconsistent. [PYPE-766] +- _(maya)_ Handles and frame ranges were inconsistent in various places during publishing. +- _(nuke)_ Nuke was crashing if it ran into certain missing knobs. For example DPX output missing `autocrop` [PYPE-774] +- _(deadline)_ Project overrides were not working properly with farm render publishing. +- _(hiero)_ Problems with single frame plates publishing. +- _(maya)_ Redshift RenderPass token were breaking render publishing. [PYPE-778] +- _(nuke)_ Build first workfile was not accepting jpeg sequences. +- _(maya)_ Multipart (Multilayer) EXRs were breaking review publishing due to FFMPEG incompatiblity [PYPE-781] + + + + +## 2.6.0 ## + +_**release date:** 9 March 2020_ + +**change:** +- _(maya)_ render publishing has been simplified and made more robust. Render setup layers are now automatically added to publishing subsets and `render globals` family has been replaced with simple `render` [PYPE-570] +- _(avalon)_ change context and workfiles apps, have been merged into one, that allows both actions to be performed at the same time. [PYPE-747] +- _(pype)_ thumbnails are now automatically propagate to asset from the last published subset in the loader +- _(ftrack)_ publishing comment and intent are now being published to ftrack note as well as describtion. [PYPE-727] +- _(pype)_ when overriding existing version new old representations are now overriden, instead of the new ones just being appended. (to allow this behaviour, the version validator need to be disabled. [PYPE-690]) +- _(pype)_ burnin preset has been significantly simplified. It now doesn't require passing function to each field, but only need the actual text template. to use this, all the current burnin PRESETS MUST BE UPDATED for all the projects. +- _(ftrack)_ credentials are now stored on a per server basis, so it's possible to switch between ftrack servers without having to log in and out. [PYPE-723] + + +**new:** +- _(pype)_ production and development deployments now have different colour of the tray icon. Orange for Dev and Green for production [PYPE-718] +- _(maya)_ renders can now be attached to a publishable subset rather than creating their own subset. For example it is possible to create a reviewable `look` or `model` render and have it correctly attached as a representation of the subsets [PYPE-451] +- _(maya)_ after saving current scene into a new context (as a new shot for instance), all the scene publishing subsets data gets re-generated automatically to match the new context [PYPE-532] +- _(pype)_ we now support project specific publish, load and create plugins [PYPE-740] +- _(ftrack)_ new action that allow archiving/deleting old published versions. User can keep how many of the latest version to keep when the action is ran. [PYPE-748, PYPE-715] +- _(ftrack)_ it is now possible to monitor and restart ftrack event server using ftrack action. [PYPE-658] +- _(pype)_ validator that prevent accidental overwrites of previously published versions. [PYPE-680] +- _(avalon)_ avalon core updated to version 5.6.0 +- _(maya)_ added validator to make sure that relative paths are used when publishing arnold standins. +- _(nukestudio)_ it is now possible to extract and publish audio family from clip in nuke studio [PYPE-682] + +**fix**: +- _(maya)_ maya set framerange button was ignoring handles [PYPE-719] +- _(ftrack)_ sync to avalon was sometime crashing when ran on empty project +- _(nukestudio)_ publishing same shots after they've been previously archived/deleted would result in a crash. [PYPE-737] +- _(nuke)_ slate workflow was breaking in certain scenarios. [PYPE-730] +- _(pype)_ rendering publish workflow has been significantly improved to prevent error resulting from implicit render collection. [PYPE-665, PYPE-746] +- _(pype)_ launching application on a non-synced project resulted in obscure [PYPE-528] +- _(pype)_ missing keys in burnins no longer result in an error. [PYPE-706] +- _(ftrack)_ create folder structure action was sometimes failing for project managers due to wrong permissions. +- _(Nukestudio)_ using `source` in the start frame tag could result in wrong frame range calculation +- _(ftrack)_ sync to avalon action and event have been improved by catching more edge cases and provessing them properly. + + + + +## 2.5.0 ## + +_**release date:** 11 Feb 2020_ + +**change:** +- _(pype)_ added many logs for easier debugging +- _(pype)_ review presets can now be separated between 2d and 3d renders [PYPE-693] +- _(pype)_ anatomy module has been greatly improved to allow for more dynamic pulblishing and faster debugging [PYPE-685] +- _(pype)_ avalon schemas have been moved from `pype-config` to `pype` repository, for simplification. [PYPE-670] +- _(ftrack)_ updated to latest ftrack API +- _(ftrack)_ publishing comments now appear in ftrack also as a note on version with customisable category [PYPE-645] +- _(ftrack)_ delete asset/subset action had been improved. It is now able to remove multiple entities and descendants of the selected entities [PYPE-361, PYPS-72] +- _(workfiles)_ added date field to workfiles app [PYPE-603] +- _(maya)_ old deprecated loader have been removed in favour of a single unified reference loader (old scenes will upgrade automatically to the new loader upon opening) [PYPE-633, PYPE-697] +- _(avalon)_ core updated to 5.5.15 [PYPE-671] +- _(nuke)_ library loader is now available in nuke [PYPE-698] + + +**new:** +- _(pype)_ added pype render wrapper to allow rendering on mixed platform farms. [PYPE-634] +- _(pype)_ added `pype launch` command. It let's admin run applications with dynamically built environment based on the given context. [PYPE-634] +- _(pype)_ added support for extracting review sequences with burnins [PYPE-657] +- _(publish)_ users can now set intent next to a comment when publishing. This will then be reflected on an attribute in ftrack. [PYPE-632] +- _(burnin)_ timecode can now be added to burnin +- _(burnin)_ datetime keys can now be added to burnin and anatomy [PYPE-651] +- _(burnin)_ anatomy templates can now be used in burnins. [PYPE=626] +- _(nuke)_ new validator for render resolution +- _(nuke)_ support for attach slate to nuke renders [PYPE-630] +- _(nuke)_ png sequences were added to loaders +- _(maya)_ added maya 2020 compatibility [PYPE-677] +- _(maya)_ ability to publish and load .ASS standin sequences [PYPS-54] +- _(pype)_ thumbnails can now be published and are visible in the loader. `AVALON_THUMBNAIL_ROOT` environment variable needs to be set for this to work [PYPE-573, PYPE-132] +- _(blender)_ base implementation of blender was added with publishing and loading of .blend files [PYPE-612] +- _(ftrack)_ new action for preparing deliveries [PYPE-639] + + +**fix**: +- _(burnin)_ more robust way of finding ffmpeg for burnins. +- _(pype)_ improved UNC paths remapping when sending to farm. +- _(pype)_ float frames sometimes made their way to representation context in database, breaking loaders [PYPE-668] +- _(pype)_ `pype install --force` was failing sometimes [PYPE-600] +- _(pype)_ padding in published files got calculated wrongly sometimes. It is now instead being always read from project anatomy. [PYPE-667] +- _(publish)_ comment publishing was failing in certain situations +- _(ftrack)_ multiple edge case scenario fixes in auto sync and sync-to-avalon action +- _(ftrack)_ sync to avalon now works on empty projects +- _(ftrack)_ thumbnail update event was failing when deleting entities [PYPE-561] +- _(nuke)_ loader applies proper colorspaces from Presets +- _(nuke)_ publishing handles didn't always work correctly [PYPE-686] +- _(maya)_ assembly publishing and loading wasn't working correctly + + + + + + +## 2.4.0 ## + +_**release date:** 9 Dec 2019_ + +**change:** +- _(ftrack)_ version to status ftrack event can now be configured from Presets + - based on preset `presets/ftracc/ftrack_config.json["status_version_to_task"]` +- _(ftrack)_ sync to avalon event has been completely re-written. It now supports most of the project management situations on ftrack including moving, renaming and deleting entities, updating attributes and working with tasks. +- _(ftrack)_ sync to avalon action has been also re-writen. It is now much faster (up to 100 times depending on a project structure), has much better logging and reporting on encountered problems, and is able to handle much more complex situations. +- _(ftrack)_ sync to avalon trigger by checking `auto-sync` toggle on ftrack [PYPE-504] +- _(pype)_ various new features in the REST api +- _(pype)_ new visual identity used across pype +- _(pype)_ started moving all requirements to pip installation rather than vendorising them in pype repository. Due to a few yet unreleased packages, this means that pype can temporarily be only installed in the offline mode. + +**new:** +- _(nuke)_ support for publishing gizmos and loading them as viewer processes +- _(nuke)_ support for publishing nuke nodes from backdrops and loading them back +- _(pype)_ burnins can now work with start and end frames as keys + - use keys `{frame_start}`, `{frame_end}` and `{current_frame}` in burnin preset to use them. [PYPS-44,PYPS-73, PYPE-602] +- _(pype)_ option to filter logs by user and level in loggin GUI +- _(pype)_ image family added to standalone publisher [PYPE-574] +- _(pype)_ matchmove family added to standalone publisher [PYPE-574] +- _(nuke)_ validator for comparing arbitrary knobs with values from presets +- _(maya)_ option to force maya to copy textures in the new look publish rather than hardlinking them +- _(pype)_ comments from pyblish GUI are now being added to ftrack version +- _(maya)_ validator for checking outdated containers in the scene +- _(maya)_ option to publish and load arnold standin sequence [PYPE-579, PYPS-54] + +**fix**: +- _(pype)_ burnins were not respecting codec of the input video +- _(nuke)_ lot's of various nuke and nuke studio fixes across the board [PYPS-45] +- _(pype)_ workfiles app is not launching with the start of the app by default [PYPE-569] +- _(ftrack)_ ftrack integration during publishing was failing under certain situations [PYPS-66] +- _(pype)_ minor fixes in REST api +- _(ftrack)_ status change event was crashing when the target status was missing [PYPS-68] +- _(ftrack)_ actions will try to reconnect if they fail for some reason +- _(maya)_ problems with fps mapping when using float FPS values +- _(deadline)_ overall improvements to deadline publishing +- _(setup)_ environment variables are now remapped on the fly based on the platform pype is running on. This fixes many issues in mixed platform environments. + + + + +## 2.3.6 # + +_**release date:** 27 Nov 2019_ + +**hotfix**: +- _(ftrack)_ was hiding important debug logo +- _(nuke)_ crashes during workfile publishing +- _(ftrack)_ event server crashes because of signal problems +- _(muster)_ problems with muster render submissions +- _(ftrack)_ thumbnail update event syntax errors + + + + +## 2.3.0 ## + +_release date: 6 Oct 2019_ + +**new**: +- _(maya)_ support for yeti rigs and yeti caches +- _(maya)_ validator for comparing arbitrary attributes against ftrack +- _(pype)_ burnins can now show current date and time +- _(muster)_ pools can now be set in render globals in maya +- _(pype)_ Rest API has been implemented in beta stage +- _(nuke)_ LUT loader has been added +- _(pype)_ rudimentary user module has been added as preparation for user management +- _(pype)_ a simple logging GUI has been added to pype tray +- _(nuke)_ nuke can now bake input process into mov +- _(maya)_ imported models now have selection handle displayed by defaulting +- _(avalon)_ it's is now possible to load multiple assets at once using loader +- _(maya)_ added ability to automatically connect yeti rig to a mesh upon loading + +**changed**: +- _(ftrack)_ event server now runs two parallel processes and is able to keep queue of events to process. +- _(nuke)_ task name is now added to all rendered subsets +- _(pype)_ adding more families to standalone publisher +- _(pype)_ standalone publisher now uses pyblish-lite +- _(pype)_ standalone publisher can now create review quicktimes +- _(ftrack)_ queries to ftrack were sped up +- _(ftrack)_ multiple ftrack action have been deprecated +- _(avalon)_ avalon upstream has been updated to 5.5.0 +- _(nukestudio)_ published transforms can now be animated +- + +**fix**: +- _(maya)_ fps popup button didn't work in some cases +- _(maya)_ geometry instances and references in maya were losing shader assignments +- _(muster)_ muster rendering templates were not working correctly +- _(maya)_ arnold tx texture conversion wasn't respecting colorspace set by the artist +- _(pype)_ problems with avalon db sync +- _(maya)_ ftrack was rounding FPS making it inconsistent +- _(pype)_ wrong icon names in Creator +- _(maya)_ scene inventory wasn't showing anything if representation was removed from database after it's been loaded to the scene +- _(nukestudio)_ multiple bugs squashed +- _(loader)_ loader was taking long time to show all the loading action when first launcher in maya + +## 2.2.0 ## +_**release date:** 8 Sept 2019_ + +**new**: +- _(pype)_ add customisable workflow for creating quicktimes from renders or playblasts +- _(nuke)_ option to choose deadline chunk size on write nodes +- _(nukestudio)_ added option to publish soft effects (subTrackItems) from NukeStudio as subsets including LUT files. these can then be loaded in nuke or NukeStudio +- _(nuke)_ option to build nuke script from previously published latest versions of plate and render subsets. +- _(nuke)_ nuke writes now have deadline tab. +- _(ftrack)_ Prepare Project action can now be used for creating the base folder structure on disk and in ftrack, setting up all the initial project attributes and it automatically prepares `pype_project_config` folder for the given project. +- _(clockify)_ Added support for time tracking in clockify. This currently in addition to ftrack time logs, but does not completely replace them. +- _(pype)_ any attributes in Creator and Loader plugins can now be customised using pype preset system + +**changed**: +- nukestudio now uses workio API for workfiles +- _(maya)_ "FIX FPS" prompt in maya now appears in the middle of the screen +- _(muster)_ can now be configured with custom templates +- _(pype)_ global publishing plugins can now be configured using presets as well as host specific ones + + +**fix**: +- wrong version retrieval from path in certain scenarios +- nuke reset resolution wasn't working in certain scenarios + +## 2.1.0 ## +_release date: 6 Aug 2019_ + +A large cleanup release. Most of the change are under the hood. + +**new**: +- _(pype)_ add customisable workflow for creating quicktimes from renders or playblasts +- _(pype)_ Added configurable option to add burnins to any generated quicktimes +- _(ftrack)_ Action that identifies what machines pype is running on. +- _(system)_ unify subprocess calls +- _(maya)_ add audio to review quicktimes +- _(nuke)_ add crop before write node to prevent overscan problems in ffmpeg +- **Nuke Studio** publishing and workfiles support +- **Muster** render manager support +- _(nuke)_ Framerange, FPS and Resolution are set automatically at startup +- _(maya)_ Ability to load published sequences as image planes +- _(system)_ Ftrack event that sets asset folder permissions based on task assignees in ftrack. +- _(maya)_ Pyblish plugin that allow validation of maya attributes +- _(system)_ added better startup logging to tray debug, including basic connection information +- _(avalon)_ option to group published subsets to groups in the loader +- _(avalon)_ loader family filters are working now + +**changed**: +- change multiple key attributes to unify their behaviour across the pipeline + - `frameRate` to `fps` + - `startFrame` to `frameStart` + - `endFrame` to `frameEnd` + - `fstart` to `frameStart` + - `fend` to `frameEnd` + - `handle_start` to `handleStart` + - `handle_end` to `handleEnd` + - `resolution_width` to `resolutionWidth` + - `resolution_height` to `resolutionHeight` + - `pixel_aspect` to `pixelAspect` + +- _(nuke)_ write nodes are now created inside group with only some attributes editable by the artist +- rendered frames are now deleted from temporary location after their publishing is finished. +- _(ftrack)_ RV action can now be launched from any entity +- after publishing only refresh button is now available in pyblish UI +- added context instance pyblish-lite so that artist knows if context plugin fails +- _(avalon)_ allow opening selected files using enter key +- _(avalon)_ core updated to v5.2.9 with our forked changes on top + +**fix**: +- faster hierarchy retrieval from db +- _(nuke)_ A lot of stability enhancements +- _(nuke studio)_ A lot of stability enhancements +- _(nuke)_ now only renders a single write node on farm +- _(ftrack)_ pype would crash when launcher project level task +- work directory was sometimes not being created correctly +- major pype.lib cleanup. Removing of unused functions, merging those that were doing the same and general house cleaning. +- _(avalon)_ subsets in maya 2019 weren't behaving correctly in the outliner diff --git a/website/docs/dev_build.md b/website/docs/dev_build.md new file mode 100644 index 0000000000..9523035705 --- /dev/null +++ b/website/docs/dev_build.md @@ -0,0 +1,189 @@ +--- +id: dev_build +title: Build openPYPE from source +sidebar_label: Build +--- + +import Tabs from '@theme/Tabs'; +import TabItem from '@theme/TabItem'; + + +To build Pype you currently need (on all platforms): + +- **[Python 3.7](https://www.python.org/downloads/)** as we are following [vfx platform](https://vfxplatform.com). +- **[git](https://git-scm.com/downloads)** + +We use [CX_Freeze](https://cx-freeze.readthedocs.io/en/latest) to freeze the code and all dependencies. + + + + + + +More tools might be needed for installing some dependencies (for example for **OpenTimelineIO**) - mostly +development tools like [CMake](https://cmake.org/) and [Visual Studio](https://visualstudio.microsoft.com/cs/downloads/) + +### Clone repository: +```sh +git clone --recurse-submodules git@github.com:pypeclub/pype.git +``` + +### Run from source + +For development purposes it is possible to run OpenPype directly from the source. We provide a simple launcher script for this. + +To start OpenPype from source you need to + +1) Run `.\tools\create_env.ps1` to create virtual environment in `.\venv` +2) Run `.\tools\run_tray.ps1` if you have all required dependencies on your machine you should be greeted with OpenPype igniter window and once you give it your Mongo URL, with OpenPype icon in the system tray. + + +### To build openPype: + +1) Run `.\tools\create_env.ps1` to create virtual environment in `.\venv` +2) Run `.\tools\build.ps1` to build pype executables in `.\build\` + +To create distributable openPype versions, run `./tools/create_zip.ps1` - that will +create zip file with name `pype-vx.x.x.zip` parsed from current pype repository and +copy it to user data dir. You can specify `--path /path/to/zip` to force it into a different +location. This can be used to prepare new version releases for artists in the studio environment +without the need to re-build the whole package + + + + + + +To build pype on linux you wil need: + +- **[curl](https://curl.se)** on systems that doesn't have one preinstalled. +- Python header files installed (**python3-dev** on Ubuntu for example). +- **bzip2**, **readline**, **sqlite3** and other libraries. + +Because some Linux distros come with newer Python version pre-installed, you might +need to install **3.7** version and make use of it explicitly. +Your best bet is probably using [pyenv](https://github.com/pyenv/pyenv). + +You can use your package manager to install **git** and other packages to your build +environment. +Use curl for pyenv installation + +:::note Install build requirements for **Ubuntu** + +```sh +sudo apt-get update; sudo apt-get install --no-install-recommends make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev git +``` + +In case you run in error about `xcb` when running Pype, +you'll need also additional libraries for Qt5: + +```sh +sudo apt install qt5-default +``` +::: + +:::note Install build requirements for **Centos** + +```sh +yum install gcc zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel openssl-devel tk-devel libffi-devel git +``` + +In case you run in error about `xcb` when running Pype, +you'll need also additional libraries for Qt5: + +```sh +sudo yum install qt5-qtbase-devel +``` + +::: + +For more information about setting your build environmet please refer to [pyenv suggested build environment](https://github.com/pyenv/pyenv/wiki#suggested-build-environment) + +#### Common steps for all Distros + +Use pyenv to prepare Python version for Pype build + +```sh +curl https://pyenv.run | bash + +# you can add those to ~/.bashrc +export PATH="$HOME/.pyenv/bin:$PATH" +eval "$(pyenv init -)" +eval "$(pyenv virtualenv-init -)" + +# reload shell +exec $SHELL + +# install Python 3.7.9 +pyenv install -v 3.7.9 + +# change path to pype 3 +cd /path/to/pype-3 + +# set local python version +pyenv local 3.7.9 + +``` + +#### To build Pype: + +1. Run `.\tools\create_env.sh` to create virtual environment in `.\venv` +2. Run `.\tools\build.sh` to build pype executables in `.\build\` + + + + +To build pype on MacOS you wil need: + +- **[Homebrew](https://brew.sh)**, Easy way of installing everything necessary is to use. +- **[CMake](https://cmake.org/)** to build some external openPype dependencies. +- **XCode Command Line Tools** (or some other build system) + +1) Install **Homebrew**: +```sh +/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" +``` + +2) Install **cmake**: +```sh +brew install cmake +``` + +3) Install [pyenv](https://github.com/pyenv/pyenv): +```sh +brew install pyenv +echo 'eval "$(pypenv init -)"' >> ~/.zshrc +pyenv init +exec "$SHELL" +PATH=$(pyenv root)/shims:$PATH +``` + +4) Pull in required Python version 3.7.x +```sh +# install Python build dependences +brew install openssl readline sqlite3 xz zlib + +# replace with up-to-date 3.7.x version +pyenv install 3.7.9 +``` + +5) Set local Python version +```sh +# switch to Pype source directory +pyenv local 3.7.9 +``` + +#### To build Pype: + +1. Run `.\tools\create_env.sh` to create virtual environment in `.\venv` +2. Run `.\tools\build.sh` to build Pype executables in `.\build\` + + + diff --git a/website/docs/dev_contribute.md b/website/docs/dev_contribute.md new file mode 100644 index 0000000000..6655ec88c1 --- /dev/null +++ b/website/docs/dev_contribute.md @@ -0,0 +1,85 @@ +--- +id: dev_contribute +title: Contribute to openPype development +sidebar_label: Contribute +--- + +## What should you do if ... + +### You found a bug. + +1. Check in the issues and our [bug triage](https://github.com/pypeclub/pype/projects/2) to make sure it wasn't reported already. +2. Ask on our [discord](http://pype.community/chat) Often, what appears as a bug, might be the intended behavior for someone else. +3. Create a new issue. +4. Use the issue template for you PR please. + + +### You wrote a patch that fixes a bug. + +- Open a new GitHub pull request with the patch. +- Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable. + + +### You intend to add a new feature or change an existing one. + +- Open a new thread in the [github discussions](https://github.com/pypeclub/pype/discussions/new) +- Do not open issue until the suggestion is discussed. We will convert accepted suggestions into backlog and point them to the relevant discussion thread to keep the context. + +### You have questions about the source code. + +Open a new question on [github discussions](https://github.com/pypeclub/pype/discussions/new) + + +## Branching Strategy + +As we move to 3.x as the primary supported version of OpenPype and only keep Pype 2.15 on bugfixes and client sponsored feature requests, we need to be very careful with merging strategy. + +These are the important branches to remember. + +### OpenPype 3.x + +**`main`** - Production branch with stable releases + +**`develop`** - Development branch where we merge all PRs during the development + +**`release/3.x.x`** - Testing branch for a release, once a release branch is crated, no new features +are accepted for the given release. Bugfixes, however, are expected. Once the branch is stable it is +merged to `main` and `develop` and `main` is tagged with a new release + +**`feature/{Issue#}-{Issue_name}`** - development of new features + +**`bugfix/{Issue#}-{Issue_name}`** - bug fixes + +**`hotfix/{Issue#}-{Issue_name}`** - production critical hotfixes (always created from `main`) + +### OpenPype 2.x + +Branching is identical to 3.x development, however all the branches should be pre-pended with +`2.x/` namespace. For example `2.x/feature/1025-support_exporting_of_alembic`, +`2.x/bugfix/wrong_colourspace_in_maya` + +Main and develop for 2.x development are `2.x/main` and `2.x/develop` + + +A few important notes about 2.x and 3.x development: + +- 3.x features are not backported to 2.x unless specifically requested. +- 3.x bugs and hotfixes can be ported to 2.x if they are relevant or severe. +- 2.x features and bugs MUST be ported to 3.x at the same time. + +## Pull Requests + +- Each 2.x PR MUST have a corresponding 3.x PR in github. Without 3.x PR, 2.x features will not be merged! Luckily most of the code is compatible, albeit sometimes in a different place after the refactoring. Porting from 2.x to 3.x should be really easy. +- Please keep the corresponding 2 and 3 PR names the same so they can be easily identified from the PR list page. +- Each 2.x PR should be labeled with `2.x-dev` label. + +Inside each PR, put a link to the corresponding PR. + +Of course if you want to contribute, feel free to make a PR to only 2.x/develop or develop, based on what you are using. While reviewing the PRs, we might convert the code to corresponding PR for the other release ourselves. + +We might also change the target of you PR to and intermediate branch, rather than `develop` if we feel it requires some extra work on our end. That way, we preserve all your commits so you don't loos out on the contribution credits. + + + + +If a PR is targeted at 2.x release it must be labelled with 2x-dev label in Github. \ No newline at end of file diff --git a/website/docs/dev_requirements.md b/website/docs/dev_requirements.md new file mode 100644 index 0000000000..bbf3b1fb5b --- /dev/null +++ b/website/docs/dev_requirements.md @@ -0,0 +1,131 @@ +--- +id: dev_requirements +title: Requirements +sidebar_label: Requirements +--- + + +We aim to closely follow [**VFX Reference Platform**](https://vfxplatform.com/) + +OpenPype is written in Python 3 with specific elements still running in Python2 until all DCCs are fully updated. To see the list of those, that are not quite there yet, go to [VFX Python3 tracker](https://vfxpy.com/) + +The main things you will need to run and build pype are: + +- **Terminal** in your OS + - PowerShell 5.0+ (Windows) + - Bash (Linux) +- [**Python 3.7.8**](#python) or higher +- [**MongoDB**](#database) + + +## OS + +It can be built and ran on all common platforms. We develop and test on the following: + +- **Windows** 10 +- **Linux** + - **Ubuntu** 20.04 LTS + - **Centos** 7 +- **Mac OSX** + - **10.15** Catalina + - **11.1** Big Sur (using Rosetta2) + + +## Database + +Pype needs site-wide installation of **MongoDB**. It should be installed on +reliable server, that all workstations (and possibly render nodes) can connect. This +server holds **Avalon** database that is at the core of everything + +Depending on project size and number of artists working connection speed and +latency influence performance experienced by artists. If remote working is required, this mongodb +server must be accessible from Internet or cloud solution can be used. Reasonable backup plan +or high availability options are recommended. *Replication* feature of MongoDB should be considered. This is beyond the +scope of this documentation, please refer to [MongoDB Documentation](https://docs.mongodb.com/manual/replication/). + +Pype can run it's own instance of mongodb, mostly for testing and development purposes. +For that it uses locally installed MongoDB. + +Download it from [mognoDB website](https://www.mongodb.com/download-center/community), install it and +add to the `PATH`. On Windows, Pype tries to find it in standard installation destination or using `PATH`. + +To run mongoDB on server, use your server distribution tools to set it up (on Linux). + +## Python + +**Python 3.7.8** is the recommended version to use (as per [VFX platform CY2021](https://vfxplatform.com/)). + +If you're planning to run openPYPE on workstations from built executables (highly recommended), you will only need python for building and development, however, if you'd like to run from source centrally, every user will need python installed. + +## Hardware + +openPYPE should be installed on all workstations that need to use it, the same as any other application. + +There are no specific requirements for the hardware. If the workstation can run +the major DCCs, it most probably can run openPYPE. + +Installed, it takes around 400MB of space, depending on the platform + + +For well functioning ftrack event server, we recommend a linux virtual server with Ubuntu or CentOS. CPU and RAM allocation needs differ based on the studio size, but a 2GB of ram, with a dual core CPU and around 4GB of storage should suffice + + +## Deployment + +For pushing pipeline updates to the artists, you will need to create a shared folder that +will be accessible with at least Read permission to every OpenPype user in the studio. +This can also be hosted on the cloud in fully distributed deployments. + + + +## Dependencies + +### Key projects we depend on + +- [**Avalon**](https://github.com/getavalon) +- [**Pyblish**](https://github.com/pyblish) +- [**OpenTimelineIO**](https://github.com/PixarAnimationStudios/OpenTimelineIO) +- [**OpenImageIO**](https://github.com/OpenImageIO/oiio) +- [**FFmpeg**](https://github.com/FFmpeg/FFmpeg) + + +### Python modules we use and their licenses + +| Package | License | +|-------------------------------------|--------------------------------------------------------------| +| acre 1.0.0 | GNU Lesser General Public License v3 (LGPLv3) | +| aiohttp 3.7.3 | Apache 2 | +| aiohttp-json-rpc 0.13.3 | Apache 2.0 | +| appdirs 1.4.4 | MIT | +| blessed 1.17.12 | MIT | +| click 7.1.2 | BSD-3-Clause | +| clique 1.5.0 | Apache License (2.0) | +| coverage 5.3.1 | Apache 2.0 | +| cx-Freeze 6.5.1 | Python Software Foundation License | +| docutils 0.16 | public domain, Python, 2-Clause BSD, GPL 3 (see COPYING.txt) | +| flake8 3.8.4 | MIT | +| ftrack-python-api 2.0.0 | Apache License (2.0) | +| jinxed 1.0.1 | MPLv2.0 +| log4mongo 1.7.0 | BSD | +| OpenTimelineIO 0.14.0.dev1 | Modified Apache 2.0 License | +| Pillow 8.1.0 | HPND | +| pyblish-base 1.8.8 | LGPL | +| pycodestyle 2.6.0 | Expat license | +| pydocstyle 5.1.1 | MIT | +| pylint 2.6.0 | GPL | +| pymongo 3.11.2 | Apache License, Version 2.0 | +| pynput 1.7.2 | LGPLv3 | +| PyQt5 5.15.2 | GPL v3 | +| pytest 6.2.1 | MIT | +| pytest-cov 2.11.0 | MIT | +| pytest-print 0.2.1 | MIT | +| pywin32-ctypes 0.2.0 | BSD | +| Qt.py 1.3.2 | MIT | +| six 1.15.0 | MIT | +| speedcopy 2.1.0 | UNKNOWN | +| Sphinx 3.4.3 | BSD | +| sphinx-qt-documentation 0.3 | BSD-3-Clause | +| sphinxcontrib-websupport 1.2.4 | BSD | +| tqdm 4.56.0 | MPLv2.0, MIT Licences | +| wheel 0.36.2 | MIT | +| wsrpc-aiohttp 3.1.1 | Apache Software License | diff --git a/website/docs/features.md b/website/docs/features.md new file mode 100644 index 0000000000..c6413a7aa7 --- /dev/null +++ b/website/docs/features.md @@ -0,0 +1,261 @@ +## Pype tray + +Ftrack + +Login + +reset Action server + +Launcher: Launch applications without the need of going through ftrack website + +Library: Browse through all the published assets across the projects. You can also launch actions. + +Standalone Publisher + +Services + +Idle manager + +Timers manager + +Statics server + +## System Admin + +Manage environments per project/shot/tasks + +Centralized pipeline installation + +Localized Python environment (for speed purposes) + +Automatic user environment updates (online/offline) + +Ability to run completely offline for TPN and MPAA certified sites + +Git controlled deployment + +Separated development and production installation for safety and testing + +Per project pipeline configuration overrides + +Linux, Windows, Mac support + +MongoDB backbone + +## Ftrack + +Launch applications + +Custom actions + +Create base project structure + +Create Folders + +Sync to Avalon + +Propagate Thumbnails + +Create required custom attributes + +launch version in RV / DJVview + +Delete assets and subsets + +Sort Client Review + +Kill old Ftrack jobs + +Event server (automatically triggered actions) + +Sync to Avalon + +Update status on the next task + +Propagate Thumbnails from version to tasks and assets/shots + +Propagate statuses between versions and tasks + +Avalon <-> Ftrack sync + +## Maya + +### Tools + +Creator + +Publisher + +Loader + +Scene Inventory + +Look assigner + +Workfiles + +### Families + +Model + +Look + +Rig + +Animation + +Cache + +Camera + +Assembly + +MayaAscii (generic scene) + +Setdress + +RenderSetup + +Review + +arnoldStandin + +vrayProxy + +vrayScene + +yetiCache + +yetiRig + +## Houdini + +### Tools + +Creator + +Publisher + +Loader + +Scene Inventory + +Look assigner + +Workfiles + +### Families + +Model + +Animation + +Cache + +Camera + +Review + +## Nuke + +Tools + +Publisher + +Loader + +Scene Inventory + +Workfiles + +Families + +Model (load only) + +Camera (load only) + +Render + +Review + +Plate + +Prerender + +## NukeStudio + +Create Shots in Ftrack and Avalon + +handles + +frame ranges + +edit in and edit out + +Publish Plates + +Any number of plate + +colorspace managed + +Attach preview quicktimes to Ftrack versions + +## Fusion + +Tools + +Publisher + +Loader + +Scene Inventory + +Workfiles + +Families + +Model (load only) + +Camera (load only) + +Render + +Review + +Plate + +Prerender + +## Deadline + +Publish to deadline from + +Maya + +Nuke + +Create preview quicktimes from rendered frames + +publish rendered outputs to Avalon and Ftrack + + ## Muster + +Publish to deadline from + +Maya + +Nuke + +Create preview quicktimes from rendered frames + +publish rendered outputs to Avalon and Ftrack + +## Clockify + +Automatic timer start and stop in sync with Ftrack. + +## Arnold + +## Vray + +## Redshift diff --git a/website/docs/hosts-maya.md b/website/docs/hosts-maya.md new file mode 100644 index 0000000000..0ee0c2d86b --- /dev/null +++ b/website/docs/hosts-maya.md @@ -0,0 +1,33 @@ +### Tools +Creator +Publisher +Loader +Scene Inventory +Look assigner +Workfiles + +### Plugins +Deadline +Muster +Yeti +Arnold +Vray +Redshift + +### Families +Model +Look +Rig +Animation +Cache +Camera +Assembly +MayaAscii (generic scene) +Setdress +RenderSetup +Review +arnoldStandin +vrayProxy +vrayScene +yetiCache +yetiRig diff --git a/website/docs/manager_ftrack.md b/website/docs/manager_ftrack.md new file mode 100644 index 0000000000..1583e74db2 --- /dev/null +++ b/website/docs/manager_ftrack.md @@ -0,0 +1,62 @@ +--- +id: manager_ftrack +title: Ftrack +sidebar_label: Project Manager +--- + +Ftrack is currently the main project management option for OpenPype. This documentation assumes that you are familiar with Ftrack and it's basic principles. If you're new to Ftrack, we recommend having a thorough look at [Ftrack Official Documentation](http://ftrack.rtd.ftrack.com/en/stable/). + +## Project management +Setting project attributes is the key to properly working pipeline. + +### New Project +The best practice for creating a new project ready for OpenPype. +1. First of all you must [create a project](http://ftrack.rtd.ftrack.com/en/stable/using/managing_projects/creating_a_new_project.html) in Ftrack. +2. All the required attributes need to be populated. The easiest way to do it is by using [Prepare Project](manager_ftrack_actions#prepare-project) action. + +:::tip +Do not forget to set up `applications` and `tools`, otherwise users won't be able to launch applications. +::: + +3. Now you can create Project hierarchy with shots, assets, tasks and others, which has [specific rules](#synchronization-rules). [Create Project Structure](manager_ftrack_actions#create-project-structure) action may help you with this step. +4. Last step is to [synchronize](#synchronization-to-avalon-database) project to Avalon database. + +:::tip +Turn on `auto-sync` attribute on your project in ftrack. That way you'll only need to synchronise the project once and all further changes will be propagated automatically. +::: + +## Synchronization to Avalon database +This process describes how data from Ftrack will get into Avalon database. + +### How to synchronize +You can trigger synchronization manually using [Sync To Avalon](manager_ftrack_actions#sync-to-avalon) action. + +Synchronization can also be automated with OpenPype's [event server](#event-server) and synchronization events. If your Ftrack is [prepared for OpenPype](#prepare-ftrack-for-openpype), the project should have custom attribute `Avalon auto-sync`. Check the custom attribute to allow auto-updates with event server. + +:::tip +Always use `Sync To Avalon` action before you enable `Avalon auto-sync`! +::: + +:::important +Synchronization actions and events can show you interface with information when something goes differently than expected. Just read carefully what happened messages should guide you. +::: + +### Synchronization rules +Required: +- entity can only contain **letters**, **numbers** and **underscore** symbols. *(In technical terms: all names must match regex: `^[a-zA-Z0-9_.]*$`)`* + +Not allowed: +- duplicated entity names within project (there can be only one shot with name "sh0010" in whole project for example) +- have any **Tasks** directly on the *Project* level + +### Managing Entities + +There are certain situations that are very hard, or even impossible to handle automatically and will have be resolved by your TD. These include + +- Deleting shots and assets after some data has already been published in them. +- Re-structuring the project hierarchy when work is already being done. +- Renaming the Project + +If you need to move entity or change its name it is possible only in the acse when no-one has worked on it yet. Once work is in progreess, you must archive the old one and create new. + +To archive entities you should use [Archive Asset/Subset](manager_ftrack_actions#delete-asset/subset) action. This will remove the selected entity from ftrack and avalon database in mostly non-destructive way, so it can be recovered later. To completely delete all traces of this such entity you'll need to go to OpenPype archive and delete them from there. diff --git a/website/docs/manager_ftrack_actions.md b/website/docs/manager_ftrack_actions.md new file mode 100644 index 0000000000..aa4c554614 --- /dev/null +++ b/website/docs/manager_ftrack_actions.md @@ -0,0 +1,316 @@ +--- +id: manager_ftrack_actions +title: Ftrack Actions +sidebar_label: Ftrack actions +--- + +Actions are small useful tools that help artists, managers and administrators. +To avoid overfilled action menu some actions are filtered by entity types and some of them by user roles permissions. + +In most cases actions filtered by entity type: +- Project +- Typed Context + - Folder + - Episode + - Sequence + - Shot + - Library + - Asset Build + - Asset Variant + - Epic + - Milestone +- Task +- Asset Version +- Component +- Review Session + +*Typed Context* is global Ftrack entity for hierarchical types representing all of them. Hierarchical types can be used for filtering too, but because they are dynamic *(you can add, modify and remove them)*, *Typed Context* is used to be more general. + +So if you do not see action you need to use check if action is available for selected *entity type* or ask *administrator* to check if you have permissions to use it. + +:::note +Actions can be heavily customised by your studio, so this guide might not fit 100 %. +::: + +:::important +Filtering can be more complicated for example a lot of actions can be shown only when one particular entity is selected. +::: + +--- +## Applications + +### Launch applications +* Entity types: Task +* User roles: All + +These actions *launch application with OpenPype * and *start timer* for the selected Task. We recommend you to launch application this way. + +:::important +Project Manager or Supervisor must set project's applications during project preparation otherwise you won't see them. Applications can be added even if the project is in progress. +::: + +--- +
+
+ +## OpenPype Admin + +
+
+ +![pype_admin-icon](assets/ftrack/ftrack-pype_admin-icon.png) + +
+
+ + +#### A group of actions that are used for OpenPype Administration. + +### Sync to Avalon +* Entity types: Project, Typed Context +* User roles: Pypeclub, Administrator, Project manager + +Synchronization to Avalon is key process to keep OpenPype data updated. Action updates selected entities (Project, Shot, Sequence, etc.) and all nested entities to Avalon database. If action is successfully finished [Sync Hier Attrs](#sync-hier-attrs) action is triggered. + +There are 2 versions of **Sync to Avalon**, first labeled as **server** second as **local**. +* **server** version will be processed with [event server](module_ftrack#event-server) +* **local** version will be processed with user's OpenPype tray application + +It is recommended to use **local** version if possible to avoid unnecessary deceleration of event server. + +### Sync Hier Attrs +* Entity types: Project, Typed Context +* User roles: Pypeclub, Administrator, Project manager + +Synchronization to Avalon of Ftrack's hierarchical Custom attributes is a bit complicated so we decided to split synchronization process into 2 actions. This action updates hierarchical Custom attributes of selected entities (Project, Shot, Sequence, etc.) and all their nested entities to pipeline database. This action is also triggered automatically after successfully finished [Sync To Avalon](#sync-to-avalon) action. + +There are 2 versions of **Sync Hier Attrs** first labeled as **server** second as **local**. +* **server** version will be processed with [event server](module_ftrack#event-server) +* **local** version will be processed with user's OpenPype application + +It is recommended to use **local** version if possible to avoid unnecessary deceleration of event server. + +### Job Killer +* Entity types: All +* User roles: Pypeclub, Administrator + +Custom Jobs in Ftrack help to track process and status of triggered actions but sometimes unexpected failure of action may happen *(Please let us know when happens)*. The failure will cause that job's status will remain set to **Running** which may cause issues in future. + +This action gives ability to *stop running jobs*. When action is triggered, an interface with all running jobs with checkbox next to each is shown. Status of checked jobs will be set to **Failure** on submit. + +### Delete Assets by Name +* Entity types: Typed Context, Task +* User roles: Pypeclub, Administrator + +With this action it's possible to delete up to 15 entities at once from active project in pipeline database. Entered names must match exactly the names stored in database. These entities also must not have children entities *(Sequence must not have Shots but Task is not entity)*. + +--- +
+
+ +## Prepare Project + +
+
+ +![prepare_project-icon](assets/ftrack/ftrack-prepare_project-icon.png) + +
+
+ +* Entity types: Project +* User roles: Pypeclub, Administrator, Project manager + +Allows project managers and coordinator to *set basic project attributes* needed for OpenPype to operate, *Create project folders* if you want and especially prepare project specific [settings](admin_settings_project). + +:::tip +It is possible to use this action during the lifetime of a project but we recommend using it only once at the start of the project. +::: + +![prepare_project_1](assets/ftrack/ftrack-prepare_project_1-small.png) + +--- +
+
+ +## Multiple Notes + +
+
+ +![multiple_notes-icon](assets/ftrack/ftrack-multiple_notes-icon.png) + +
+
+ +* Entity types: Asset Version +* User roles: All + +You can add same note to multiple Asset Versions at once with this action. +![multiple_notes_1](assets/ftrack/ftrack-multiple_notes_1-small.png) + +--- +
+
+ +## Delete Asset/Subset + +
+
+ +![delete_asset-icon](assets/ftrack/ftrack-delete_asset-icon.png) + +
+
+ +* Entity types: Typed Context, Task +* User roles: Pypeclub, Administrator + +Action deletes Entities and Asset Versions from Ftrack and Avalon database. + +You should use this action if you need to delete Entities or Asset Versions otherwise deletion will not take effect in Avalon database. Currently the action allows to only delete one entity at the time. Entity also must not have any children. + +--- +
+
+ +## Create Project Structure + +
+
+ +![create_project_folders-icon](assets/ftrack/ftrack-create_project_folders-icon.png) + +
+
+ +* Entity types: Project +* User roles: Pypeclub, Administrator + +*Create Project Structure* helps to create basic folder structure and may create the main ftrack entities for the project. + +Structure is loaded from settings *(OpenPype Settings → Project → Global → Project Folder Structure)*. You should examine these settings to see how it works. Settings may contain dictionaries of nested dictionaries where each key represents a folder name. Key and all it's parents will be also created in Ftrack if the key ends with `[ftrack]`. Default Ftrack entity type is *Folder* but entity type can be specified using `[ftrack.{entity type}]`. To create *Sequence* with name *Seq_001* key should look like `Seq_001[ftrack.Sequence]`. + +:::note +Please keep in mind this action is meant to make your project setup faster at the very beginning, but it does not create folders for each shot and asset. For creating asset folder refer to `Create Folders` Action +::: + +--- +
+
+ +## Delivery + +
+
+ +![ftrack-delivery-icon](assets/ftrack/ftrack-delivery-icon.png) + +
+
+ +* Entity types: Task +* User roles: Pypeclub, Project manager, Administrator + +Collects approved hires files and copy them into a folder. It takes any components of any versions and copies and renames them correctly. + + +--- +
+
+ +## Create Folders + +
+
+ +![create_folders-icon](assets/ftrack/ftrack-create_folders-icon.png) + +
+
+ +* Entity types: Typed Context, Task +* User roles: All + +It is usually not necessary to launch this action because folders are created automatically every time you start working on a task. However it can be handy if you need to create folders before any work begins or you want to use applications that don't have pipeline implementation. + +--- +
+
+ +## Thumbnail + +
+
+ +![thumbnail-icon](assets/ftrack/ftrack-thumbnail-icon.png) + +
+
+ +A group of actions for thumbnail management. + +### Thumbnail to Parent +Propagates the thumbnail of the selected entity to its parent. + +### Thumbnail to Children +Propagates the thumbnail of the selected entity to its first direct children entities. + +--- +## RV +* Entity types: All +* User roles: All + +You can launch RV player with playable components from selected entities. You can choose which components will be played. + +:::important +You must have RV player installed and licensed and have correct RV environments set to be able use this action. +::: + +--- +## DJV View +* Entity types: Task, Asset Version +* User roles: All + +You can launch DJV View with one playable component from selected entities. You can choose which component will be played. + +:::important +You must have DJV View installed and configured in studio-config to be able use this action. +::: + +--- +
+
+ +## Open File + +
+
+ +![component_open-icon](assets/ftrack/ftrack-component_open-icon.png) + +
+
+ +* Entity types: File Component +* User roles: All + +This action will open folder of selected *Component* on *Asset Version*. + +:::warning +Does not work for components uploaded to Ftrack Web server. +::: +![component_open_1](assets/ftrack/ftrack-component_open_1-small.png) + +:::warning +Component's path must be accessible by current OS. +::: + +--- +## Sort Review +* Entity types: Review Session +* User roles: All + +Helps you sort *Asset Versions* in *Client Review Session*. + +Asset Versions are sorted by *Version number*, *Task name* and *Version name*. diff --git a/website/docs/manager_naming.md b/website/docs/manager_naming.md new file mode 100644 index 0000000000..bf822fbeb4 --- /dev/null +++ b/website/docs/manager_naming.md @@ -0,0 +1,56 @@ +--- +id: manager_naming +title: Naming Conventions +sidebar_label: Naming Conventions +--- + +:::note +This naming convention holds true for most of our pipeline. Please match it as close as possible even for projects and files that might be outside of pipeline scope at this point. Small errors count! The reason for given formatting is to allow people to understand the file at glance and that a script or a program can easily get meaningful information from your files without errors. +::: + +## General rules + +For more detailed rules and different file types, have a look at naming conventions for scenes and assets + +- Every file starts with file code based on a project it belongs to e.g. ‘tst_’, ‘drm_’ +- Optional subversion and comment always comes after the major version. v##.subversion_comment. +- File names can only be composed of letters, numbers, underscores `_` and dots “.” +- You can use snakeCase or CamelCase if you need more words in a section.  thisIsLongerSentenceInComment +- No spaces in filenames. Ever! +- Frame numbers are always separated by a period ”.” +- If you're not sure use this template: + +## Work files + +**`{code}_{shot}_{task}_v001.ext`** + +**`{code}_{asset}_{task}_v001.ext`** + +**Examples:** + + prj_sh010_enviro_v001.ma + prj_sh010_animation_v001.ma + prj_sh010_comp_v001.nk + + prj_bob_modelling_v001.ma + prj_bob_rigging_v001.ma + prj_bob_lookdev_v001.ma + +:::info +In all of the examples anything enclosed in curly brackets  { } is compulsory in the name. +Anything in square brackets [ ] is optional. +::: + +## Published Assets + +**`{code}_{asset}_{family}_{subset}_{version}_[comment].ext`** + +**Examples:** + + prj_bob_model_main_v01.ma + prj_bob_model_hires_v01.ma + prj_bob_model_main_v01_clothes.ma + prj_bob_model_main_v01_body.ma + prj_bob_rig_main_v01.ma + Prj_bob_look_main_v01.ma + Prj_bob_look_wet_v01.ma diff --git a/website/docs/module_clockify.md b/website/docs/module_clockify.md new file mode 100644 index 0000000000..f1020ab818 --- /dev/null +++ b/website/docs/module_clockify.md @@ -0,0 +1,10 @@ +--- +id: module_clockify +title: Clockify Administration +sidebar_label: Clockify +--- + +import Tabs from '@theme/Tabs'; +import TabItem from '@theme/TabItem'; + + diff --git a/website/docs/module_deadline.md b/website/docs/module_deadline.md new file mode 100644 index 0000000000..b4cf85abc2 --- /dev/null +++ b/website/docs/module_deadline.md @@ -0,0 +1,76 @@ +--- +id: module_deadline +title: Deadline Administration +sidebar_label: Deadline +--- + +import Tabs from '@theme/Tabs'; +import TabItem from '@theme/TabItem'; + + +## Preparation + +For [AWS Thinkbox Deadline](https://www.awsthinkbox.com/deadline) support you need to set a few things up in both OpenPype and Deadline itself + +1. Deploy OpenPype executable to all nodes of Deadline farm. See [Install & Run](admin_use) + +2. Enable Deadline module it in the [settings](admin_settings_system#deadline) + +3. Set up *Deadline Web API service*. For more details on how to do it, see [here](https://docs.thinkboxsoftware.com/products/deadline/10.0/1_User%20Manual/manual/web-service.html). + +4. Point OpenPype to your deadline webservice URL in the [settings](admin_settings_system#deadline) + +5. Install our custom plugin, event plugin and scripts to your deadline repository. It should be as simple as copying content of `openPype/vendor/deadline/custom` to `path/to/your/deadline/repository/custom` + + +## Configuration + +OpenPype integration with Deadline consists of two parts, event listener which gets triggered for each job and + handles populating rendering jobs with proper environment variables and +OpenPype plugin which handles publishing itself. + +Both need to be configured by pointing DL to OpenPype executables. These executables need to be installed to +destinations accessible by DL process. Check permissions (must be executable and accessible by Deadline process) + +- Enable `Tools > Super User Mode` in Deadline Monitor + +- Go to `Tools > Configure plugins`, find `OpenPype` in the list on the left side, find location of OpenPype +executable. It is recommended to use the `openpype_console` executable as it provides a bit more logging. + +- In case of multi OS farms, provide multiple locations, each node goes through a list and tries to find accessible + locations for itself. + +![Configure plugin](assets/deadline_configure_plugin.png) + +- Go to `Tools > Configure events`, find `OpenPype` in the list on the left side, find location of OpenPype +executable. It is recommended to use the `openpype_console` executable as it provides a bit more logging. + +- State is expected to be set to `Global Enabled` + +![Configure event](assets/deadline_configure_event.png) + +Path to executables needs to be configured on both, plugin and event level! + +## Troubleshooting + +#### Publishing jobs fail directly in DCCs + +- Double check that all previously described steps were finished +- Check that `deadlinewebservice` is running on DL server +- Check that user's machine has access to deadline server on configured port + +#### Jobs are failing on DL side + +Each publishing from OpenPype consists of 2 jobs, first one is rendering, second one is the publishing job (triggered after successful finish of the rendering job). + +![Jobs in DL](assets/deadline_fail.png) + +- Jobs are failing with `OpenPype executable was not found` error + + Check if OpenPype is installed on a node handling this job, plugin and events are properly [configured](#configuration) + +- Publishing job is failing with `ffmpeg not installed` error + + OpenPype executable has to have access to `ffmpeg` executable, check OpenPype `Setting > General` + +![FFmpeg setting](assets/ffmpeg_path.png) \ No newline at end of file diff --git a/website/docs/module_ftrack.md b/website/docs/module_ftrack.md new file mode 100644 index 0000000000..bd0dbaef4f --- /dev/null +++ b/website/docs/module_ftrack.md @@ -0,0 +1,216 @@ +--- +id: module_ftrack +title: Ftrack Administration +sidebar_label: Ftrack +--- + +import Tabs from '@theme/Tabs'; +import TabItem from '@theme/TabItem'; + + +Ftrack is currently the main project management option for OpenPype. This documentation assumes that you are familiar with Ftrack and it's basic principles. If you're new to Ftrack, we recommend having a thorough look at [Ftrack Official Documentation](http://ftrack.rtd.ftrack.com/en/stable/). + +## Prepare Ftrack for OpenPype + +### Server URL +If you want to connect Ftrack to OpenPype you might need to make few changes in Ftrack settings. These changes would take a long time to do manually, so we prepared a few Ftrack actions to help you out. First, you'll need to launch OpenPype settings, enable [Ftrack module](admin_settings_system#Ftrack), and enter the address to your Ftrack server. + +### Login +Once your server is configured, restart OpenPype and you should be prompted to enter your [Ftrack credentials](artist_ftrack#How-to-use-Ftrack-in-OpenPype) to be able to run our Ftrack actions. If you are already logged in to Ftrack in your browser, it is enough to press `Ftrack login` and it will connect automatically. + +For more details step by step on how to login to Ftrack in OpenPype to go [artist Ftrack login](artist_ftrack#How-to-use-Ftrack-in-OpenPype) documentation. + +You can only use our Ftrack Actions and publish to Ftrack if each artist is logged in. + + +### Custom Attributes +After successfully connecting OpenPype with you Ftrack, you can right click on any project in Ftrack and you should see a bunch of actions available. The most important one is called `OpenPype Admin` and contains multiple options inside. + +To prepare Ftrack for working with OpenPype you'll need to run [OpenPype Admin - Create/Update Avalon Attributes](manager_ftrack_actions#create-update-avalon-attributes), which creates and sets the Custom Attributes necessary for OpenPype to function. + + + +## Event Server +Ftrack Event Server is the key to automation of many tasks like _status change_, _thumbnail update_, _automatic synchronization to Avalon database_ and many more. Event server should run at all times to perform the required processing as it is not possible to catch some of them retrospectively with enough certainty. + +### Running event server +There are specific launch arguments for event server. With `openpype eventserver` you can launch event server but without prior preparation it will terminate immediately. The reason is that event server requires 3 pieces of information: _Ftrack server url_, _paths to events_ and _credentials (Username and API key)_. Ftrack server URL and Event path are set from OpenPype's environments by default, but the credentials must be done separatelly for security reasons. + + + +:::note There are 2 ways of passing your credentials to event server. + + + + + +- **`--ftrack-user "your.username"`** : Ftrack Username +- **`--ftrack-api-key "00000aaa-11bb-22cc-33dd-444444eeeee"`** : User's API key +- **`--store-crededentials`** : Entered credentials will be stored for next launch with this argument _(It is not needed to enter **ftrackuser** and **ftrackapikey** args on next launch)_ +- **`--no-stored-credentials`** : Stored credentials are loaded first so if you want to change credentials use this argument +- `--ftrack-url "https://yourdomain.ftrackapp.com/"` : Ftrack server URL _(it is not needed to enter if you have set `FTRACK_SERVER` in OpenPype' environments)_ +- `--ftrack-events-path "//Paths/To/Events/"` : Paths to events folder. May contain multiple paths separated by `;`. _(it is not needed to enter if you have set `FTRACK_EVENTS_PATH` in OpenPype' environments)_ + +So if you want to use OpenPype's environments then you can launch event server for first time with these arguments `openpype.exe eventserver --ftrack-user "my.username" --ftrack-api-key "00000aaa-11bb-22cc-33dd-444444eeeee" --store-credentials`. Since that time, if everything was entered correctly, you can launch event server with `openpype.exe eventserver`. + + + + +- `FTRACK_API_USER` - Username _("your.username")_ +- `FTRACK_API_KEY` - User's API key _("00000aaa-11bb-22cc-33dd-444444eeeee")_ +- `FTRACK_SERVER` - Ftrack server url _(")_ +- `FTRACK_EVENTS_PATH` - Paths to events _("//Paths/To/Events/")_ + We do not recommend you this way. + + + +::: + +:::caution +We do not recommend setting your Ftrack user and api key environments in a persistent way, for security reasons. Option 1. passing them as arguments is substantially safer. +::: + +### Where to run event server + +We recommend you to run event server on stable server machine with ability to connect to Avalon database and Ftrack web server. Best practice we recommend is to run event server as service. It can be Windows or Linux. + +:::important +Event server should **not** run more than once! It may cause major issues. +::: + +### Which user to use + +- must have at least `Administrator` role +- the same user should not be used by an artist + + +:::note How to create Eventserver service + + + + +- create file: + `sudo vi /opt/OpenPype/run_event_server.sh` +- add content to the file: +```sh +#!\usr\bin\env +export OPENPYPE_DEBUG=3 +pushd /mnt/pipeline/prod/openpype-setup +. openpype eventserver --ftrack-user --ftrack-api-key +``` +- create service file: + `sudo vi /etc/systemd/system/openpype-ftrack-event-server.service` +- add content to the service file + +```toml +[Unit] +Description=Run OpenPype Ftrack Event Server Service +After=network.target + +[Service] +Type=idle +ExecStart=/opt/openpype/run_event_server.sh +Restart=on-failure +RestartSec=10s + +[Install] +WantedBy=multi-user.target +``` + +- change file permission: + `sudo chmod 0755 /etc/systemd/system/openpype-ftrack-event-server.service` + +- enable service: + `sudo systemctl enable openpype-ftrack-event-server` + +- start service: + `sudo systemctl start openpype-ftrack-event-server` + + + + +- create service file: `openpype-ftrack-eventserver.bat` +- add content to the service file: +```sh +@echo off +set OPENPYPE_DEBUG=3 +pushd \\path\to\file\ +call openpype.bat eventserver --ftrack-user --ftrack-api-key +``` +- download and install `nssm.cc` +- create Windows service according to nssm.cc manual +- you can also run eventserver as a standard Schedule task +- be aware of using UNC path + + + +::: + +* * * + +## Ftrack events + +Events are helpers for automation. They react to Ftrack Web Server events like change entity attribute, create of entity, etc. + +### Sync to Avalon + +Automatic [synchronization to pipeline database](manager_ftrack#synchronization-to-avalon-database). + +This event updates entities on their changes Ftrack. When new entity is created or existing entity is modified. Interface with listing information is shown to users when [synchronization rules](manager_ftrack#synchronization-rules) are not met. This event may also undo changes when they might break pipeline. Namely _change name of synchronized entity_, _move synchronized entity in hierarchy_. + +:::important +Deleting an entity by Ftrack's default is not processed for security reasons _(to delete entity use [Delete Asset/Subset action](manager_ftrack_actions#delete-asset-subset))_. +::: + +### Synchronize Hierarchical and Entity Attributes + +Auto-synchronization of hierarchical attributes from Ftrack entities. + +Related to [Synchronize to Avalon database](manager_ftrack#synchronization-to-avalon-database) event _(without it, it makes no sense to use this event)_. Hierarchical attributes must be synchronized with special way so we needed to split synchronization into 2 parts. There are [synchronization rules](manager_ftrack#synchronization-rules) for hierarchical attributes that must be met otherwise interface with messages about not meeting conditions is shown to user. + +### Update Hierarchy thumbnails + +Push thumbnails from version, up through multiple hierarchy levels + +### Update status on task action + +Change status of next task from `Not started` to `Ready` when previous task is approved. + +Multiple detailed rules for next task update can be configured in the settings. + +### Delete Avalon ID from new entity + +Is used to remove value from `Avalon/Mongo Id` Custom Attribute when entity is created. + +`Avalon/Mongo Id` Custom Attribute stores id of synchronized entities in pipeline database. When user _Copy → Paste_ selection of entities to create similar hierarchy entities, values from Custom Attributes are copied too. That causes issues during synchronization because there are multiple entities with same value of `Avalon/Mongo Id`. To avoid this error we preventively remove these values when entity is created. + +### Sync status from Task to Parent + +List of parent boject types where this is triggered ("Shot", "Asset build", etc. Skipped if it is empty) + +### Sync status from Version to Task + +Updates Task status based on status changes on its Asset Version. + +The issue this solves is when Asset version's status is changed but the artist assigned to Task is looking at the task status, thus not noticing the review. + +This event makes sure statuses Asset Version get synced to it's task. After changing a status on version, this event first tries to set identical status to version's parent (usually task). But this behavior can be tweaked in settings. + +### Sync status on first created version + +This event handler allows setting of different status to a first created Asset Version in Ftrack. + +This is usefull for example if first version publish doesn't contain any actual reviewable work, but is only used for roundtrip conform check, in which case this version could receive status `pending conform` instead of standard `pending review` + +### Update status on next task +Change status on next task by task types order when task status state changed to "Done". All tasks with the same Task mapping of next task status changes From → To. Some status can be ignored. diff --git a/website/docs/module_muster.md b/website/docs/module_muster.md new file mode 100644 index 0000000000..28c4b33aa8 --- /dev/null +++ b/website/docs/module_muster.md @@ -0,0 +1,10 @@ +--- +id: module_muster +title: Muster Administration +sidebar_label: Muster +--- + +import Tabs from '@theme/Tabs'; +import TabItem from '@theme/TabItem'; + + diff --git a/website/docs/module_site_sync.md b/website/docs/module_site_sync.md new file mode 100644 index 0000000000..1b728e151a --- /dev/null +++ b/website/docs/module_site_sync.md @@ -0,0 +1,10 @@ +--- +id: module_site_sync +title: Site Sync Administration +sidebar_label: Site Sync +--- + +import Tabs from '@theme/Tabs'; +import TabItem from '@theme/TabItem'; + + diff --git a/website/docs/pype2/admin_anatomy.md b/website/docs/pype2/admin_anatomy.md new file mode 100644 index 0000000000..7f6342ff78 --- /dev/null +++ b/website/docs/pype2/admin_anatomy.md @@ -0,0 +1,78 @@ +--- +id: admin_anatomy +title: Project Anatomy +sidebar_label: Folder Structure +--- + +## PROJECT Structure + +This is example project structure when using Pype: + +```text +Project + ├───assets + │ ├───Bob + │ └───... + └───episodes + └───ep01 + └───sq01 + └───ep01_sq01_sh001 + ├───publish + └───work +``` + +:::note Shot naming +We do strongly recommend to name shots with their full hierarchical name. Avalon doesn't allow two assets with same name in project. Therefor if you have for example: + +```text +sequence01 / shot001 +``` +and then +```text +sequence02 / shot001 +``` +you'll run into trouble because there are now two `shot001`. + +Better way is to use full qualified name for shot. So the above become: +```text +sequence01 / sequence01_shot001 +``` + +This has two advantages: there will be no duplicities this way and artists can see just by looking at filename the whole hierarchy. +::: + +## ASSET Structure + +```text +Bob + ├───publish + │ ├───model + │ │ ├───modelMain + │ │ ├───modelProxy + │ │ └───modelSculpt + │ ├───workfile + │ │ └───taskName + │ ├───rig + │ │ └───rigMain + │ ├───look + │ │ ├───lookMain + │ │ │ └───v01 + │ │ │ └───texture + │ │ └───lookWet + │ ├───camera + │ │ ├───camMain + │ │ └───camLayout + │ ├───cache + │ │ ├───cacheChar01 + │ │ └───cacheRock01 + │ ├───vrproxy + │ ├───fx + │ └───setdress + └───work + ├───concept + ├───fur + ├───modelling + ├───rig + ├───look + └───taskName +``` diff --git a/website/docs/pype2/admin_config.md b/website/docs/pype2/admin_config.md new file mode 100644 index 0000000000..c753ee85a4 --- /dev/null +++ b/website/docs/pype2/admin_config.md @@ -0,0 +1,392 @@ +--- +id: admin_config +title: Studio Config +sidebar_label: Studio Config +--- + +All of the studio specific configurations are stored as simple JSON files in the **pype-config** repository. + +Config is split into multiple sections described below. + +## Anatomy + +Defines where and how folders and files are created for all the project data. Anatomy has two parts **Roots** and **Templates**. + +:::warning +It is recommended to create anatomy [overrides](#per-project-configuration) for each project even if values haven't changed. Ignoring this recommendation may cause catastrophic consequences. +::: + +### Roots +Roots define where files are stored with path to shared folder. You can set them in `roots.json`. +It is required to set root path for each platform you are using in studio. All paths must point to same folder! +```json +{ + "windows": "P:/projects", + "darwin": "/Volumes/projects", + "linux": "/mnt/share/projects" +} +``` + +It is possible to set multiple roots when necessary. That may be handy when you need to store specific type of data on another disk. In that case you'll have to add one level in json. +```json +{ + "work": { + "windows": "P:/work", + "darwin": "/Volumes/work", + "linux": "/mnt/share/work" + }, + "publish": { + "windows": "Y:/publish", + "darwin": "/Volumes/publish", + "linux": "/mnt/share/publish" + } +} +``` +Usage of multiple roots is explained below in templates part. + +### Templates +Templates define project's folder structure and filenames. You can set them in `default.yaml`. + +### Required templates +We have a few required anatomy templates for Pype to work properly, however we keep adding more when needed. + +```yaml +work: + folder: "{root}/{project[name]}/{hierarchy}/{asset}/work/{task}" + file: "{project[code]}_{asset}_{task}_v{version:0>3}<_{comment}>.{ext}" + path: "{root}/{project[name]}/{hierarchy}/{asset}/work/{task}/{project[code]}_{asset}_{task}_v{version:0>3}<_{comment}>.{ext}" + +publish: + folder: "{root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/v{version:0>3}" + file: "{project[code]}_{asset}_{subset}_v{version:0>3}<.{frame}>.{representation}" + path: "{root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/v{version:0>3}/{project[code]}_{asset}_{subset}_v{version:0>3}<.{frame}>.{representation}" +``` + +Template groups `work` and `publish` must be set in all circumstances. Both must have set keys as shown `folder`, holds path template for the directory where the files are stored, `file` only holds the filename and `path` combines the two together for quicker access. + +### Available keys +| Context key | Description | +| --- | --- | +| root | Path to root folder | +| root[\] | Path to root folder when multiple roots are used.
Key `` represents root key specified in `roots.json` | +| project[name] | Project's full name. | +| project[code] | Project's code. | +| hierarchy | All hierarchical parents as subfolders. | +| asset | Name of asset or shot. | +| task | Name of task. | +| version | Version number. | +| subset | Subset name. | +| family | Main family name. | +| ext | File extention. (Possible to use only in `work` template atm.) | +| representation | Representation name. (Is used instead of `ext` except `work` template atm.) | +| frame | Frame number for sequence files. | +| output | | +| comment | | + +:::warning +Be careful about using `root` key in templates when using multiple roots. It is not allowed to combine both `{root}` and `{root[]}` in templates. +::: +:::note +It is recommended to set padding for `version` which is possible with additional expression in template. Entered key `{version:0<3}` will result into `001` if version `1` is published. +**Explanation:** Expression `0<3` will add `"0"` char to the beginning(`<`) until string has `3` characters. +::: + +| Date-Time key | Example result | Description | +| --- | --- | --- | +| d | 1, 30 | Day of month in shortest possible way. | +| dd | 01, 30 | Day of month with 2 digits. | +| ddd | Mon | Shortened week day name. | +| dddd | Monday | Full week day name. | +| m | 1, 12 | Month number in shortest possible way. | +| mm | 01, 12 | Month number with 2 digits. | +| mmm | Jan | Shortened month name. | +| mmmm | January | Full month name. | +| yy | 20 | Shortened year. | +| yyyy | 2020 | Full year. | +| H | 4, 17 | Shortened 24-hour number. | +| HH | 04, 17 | 24-hour number with 2 digits. | +| h | 5 | Shortened 12-hour number. | +| hh | 05 | 12-hour number with 2 digits. | +| ht | AM, PM | Midday part. | +| M | 0 | Shortened minutes number. | +| MM | 00 | Minutes number with 2 digits. | +| S | 0 | Shortened seconds number. | +| SS | 00 | Seconds number with 2 digits. | + +### Optional keys +Keys may be optional for some reason when are wrapped with `<` and `>`. But it is recommended to use only for these specific keys with obvious reasons: +- `output`, `comment` are optional to fill +- `frame` is used only for sequences. + +### Inner keys +It is possible to use value of one template key inside value of another template key. This can be done only per template group, which means it is not possible to use template key from `publish` group inside `work` group. + +Usage is similar to using template keys but instead of `{key}` you must add `@` in front of key: `{@key}` + +With this feature `work` template from example above may be much easier to read and modify. +```yaml +work: + folder: "{root}/{project[name]}/{hierarchy}/{asset}/work/{task}" + file: "{project[code]}_{asset}_{task}_v{version:0>3}<_{comment}>.{ext}" + path: "{@folder}/{@file}" + # This is how `path` key will look as result + # path: "{root}/{project[name]}/{hierarchy}/{asset}/work/{task}/{project[code]}_{asset}_{task}_v{version:0>3}<_{comment}>.{ext}" +``` + +:::warning +Be aware of unsolvable recursion in inner keys. +```yaml +group: + # Use key where source key is used in value + key_1: "{@key_2}" + key_2: "{@key_1}" + + # Use itself + key_3: "{@key_3}" +``` +::: + +### Global keys +Global keys are keys with value outside template groups. All these keys will be available in each template group with ability to override them inside the group. + +**Source** +```yaml +# Global key outside template group +global_key: "global value" + +group_1: + # `global_key` is not set + example_key_1: "{example_value_1}" + +group_2: + # `global_key` is iverrided + global_key: "overriden global value" +``` +**Result** +```yaml +global_key: "global value" + +group_1: + # `global_key` was added + global_key: "global value" + example_key_1: "{example_value_1}" + +group_2: + # `global_key` kept it's value for `group_2` + global_key: "overriden global value" +``` + +### Combine Inner keys with Global keys +Real power of [Inner](#inner-keys) and [Global](#global-keys) keys is their combination. + +**Template source** +```yaml +# PADDING +frame_padding: 4 +frame: "{frame:0>frame_padding}" +# MULTIPLE ROOT +root_name: "root_name_1" +root: {root[{@root_name}]} + +group_1: + example_key_1: "{@root}/{@frame}" + +group_2: + frame_padding: 3 + root_name: "root_name_2" + example_key_2: "{@root}/{@frame}" + +group_3: + frame: "{frame}" + example_key_3: "{@root}/force_value/{@frame}" +``` +**Equals** +```yaml +frame_padding: 4 +frame: "{frame:0>3}" +root_name: "root_name_1" +root: {root[root_name_1]} + +group_1: + frame_padding: 4 + frame: "{frame:0>3}" + root_name: "root_name_1" + root: {root[root_name_1]} + # `example_key_1` result + example_key_1: "{root[root_name_1]}/{frame:0>3}" + +group_2: + frame_padding: 3 + frame: "{frame:0>3}" + root_name: "root_name_2" + root: {root[root_name_2]} + # `example_key_2` result + example_key_2: "{root[root_name_2]}/{frame:0>2}" + +group_3: + frame_padding: 4 + frame: "{frame}" + root_name: "root_name_1" + root: {root[root_name_1]} + # `example_key_3` result + example_key_3: "{root[root_name_1]}/force_value/{frame}" +``` + +:::warning +Be careful about using global keys. Keep in mind that **all global keys** will be added to **all template groups** and all inner keys in their values **MUST** be in the group. +For example in [required templates](#required-templates) it seems that `path: "{@folder}/{@file}"` should be used as global key, but that would require all template groups have `folder` and `file` keys which is not true by default. +::: + +## Environments + +Here is where all the environment variables are set up. Each software has it's own environment file where we set all variables needed for it to function correctly. This is also a place where any extra in-house variables should be added. All of these individual configs and then loaded additively as needed based on current context. + +For example when launching Pype Tray, **Global** and **Avalon** envs are loaded first. If the studio uses also *Deadline* and *Ftrack*, both of those environments get added at the same time. This sets the base environment for the rest of the pipeline that will be inherited by all the applications launched from this point on. + +When user launches an application for a task, its general and versioned env files get added to the base before the software launches. When launching *Maya 2019*, both `maya.json` and `maya_2019.json` will be added. + +If the project or task also has extra tools configured, say *Arnold Mtoa 3.1.1*, a config JSON with the same name will be added too. + +This way the environment is completely dynamic with possibility of overrides on a granular level, from project all the way down to task. + +## Launchers + +Considering that different studios use different ways of deploying software to their workstations, we need to tell Pype how to launch all the individual applications available in the studio. + +Each software need multiple files prepared for it to function correctly. + +```text +application_name.toml +application_name.bat +application_name.sh +``` + +TOML file tells Pype how to work with the application across the board. Icons, Label in GUI, *Ftrack* settings but most importantly it defines what executable to run. These executable are stored in the windows and linux subfolder in the launchers folder. If `application_name.toml` defines that executable to run is `application_name`, Pype assumes that a `.bat` and `.sh` files under that name exist in the linux and windows folders in launchers. Correct version is picked automatically based on the platform Pype is running on. + +These `.bat` and `.sh` scripts have only one job then. They have to point to the exact executable path on the system, or to a command that will launch the app we want. Version granularity is up to the studio to decide. We can show artists Nuke 11.3, while specifying the particular version 11.3v4 only in the .bat file, so the artist doesn't need to deal with it, or we can present him with 11.3v4 directly. the choice is mostly between artist control vs more configuration files on the system. + +## Presets + +This is where most of the functions configuration of the pipeline happens. Colorspace, data types, burnin setting, geometry naming conventions, ftrack attributes, playblast settings, types of exports and lot's of other settings. + +Presets are categorized in folders based on what they control or what host (DCC application) they are for. We're slowly working on documenting them all, but new ones are being created regularly as well. Hopefully the categories and names are sufficiently self-explanatory. + +### colorspace + +Defines all available color spaces in the studio. These configs not only tell the system what OCIO to use, but also how exactly it needs to be applied in the give application. From loading the data, trough previewing it all the way to rendered + +### Dataflow + +Defines allowed file types and data formats across the pipeline including their particular coded and compression settings. + +### Plugins + +All the creator, loader and publisher configurations are stored here. We can override any properties of the default plugin values and more. + +#### How does it work + +Overriding plugin properties is as simple as adding what needs to be changed to +JSON file along with plugin name. + +Say you have name validating plugin: + +```python +import pyblish.api + + +class ValidateModelName(pyblish.api.InstancePlugin): + + order = pype.api.ValidateContentsOrder + hosts = ['maya'] + families = ['model'] + label = 'Validate Mesh Name' + + # check for: 'foo_001_bar_GEO` + regex = r'.*_\d*_.*_GEO' + + def process(self, instance): + # pseudocode to get nodes + models = get_models(instance.data.get("setMembers", None)) + r = re.compile(self.regex) + for model in models: + m = r.match(obj) + if m is None: + raise RuntimeError("invalid name on {}".format(model)) + +``` +_This is just non-functional example_ + +Instead of creating new plugin with different regex, you can put: + +```javascript +"ValidateModelName": { + "regex": ".*\\d*_.*_geometry" +} +``` +and put it into `repos/pype-config/presets/plugins/maya/publish.json`. There can be more entries +like that for how many plugins you need. + +That will effectively replace regex defined in plugin during runtime with the one you've just +defined in JSON file. This way you can change any properties defined in plugin. + +:::tip loader and creators +Similar way exist for *Loaders* and *Creators*. Use files `create.json` for Creators, `load.json` +for Loaders and `publish.json` for **Pyblish** plugins like extractors, validators, etc. + +Preset resolution works by getting host name (for example *Maya*) and then looking inside + `repos/pype-config/presets/plugins//publish.json` path. If plugin is not found, then + `repos/pype-config/presets/plugins/global/publish.json` is tried. +::: + +:::tip Per project plugin override +You can override plugins per project. See [Per-project configuration](#per-project-configuration) +::: + + +## Schema + +Holds all database schemas for *mongoDB*, that we use. In practice these are never changed on a per studio basis, however we included them in the config for cases where a particular project might need a very individual treatment. + +## Per-project configuration + +You can have per-project configuration with Pype. This allows you to have for example different +validation requirements, file naming, etc. + +This is very easy to set up - point `PYPE_PROJECT_CONFIGS` environment variable to place +where you want those per-project configurations. Then just create directory with project name and +that's almost it. Inside, you can follow hierarchy of **pype-config** presets. Everything put there +will override stuff in **pype-config**. + +### Example + +You have a project where you need to disable some validators - let's say overlapping +UVs validator in Maya. + +Project name is *FooProject*. +Your `PYPE_PROJECT_CONFIGS` points to `/studio/pype/projects`. + +Create projects settings directory: +```sh +mkdir $PYPE_PROJECT_CONFIGS/FooProject +``` +Now you can use plugin overrides to disable validator: + +Put: +```javascript +{ + "ValidateMeshHasOverlappingUVs": { + "enabled": false + } +} +``` +into: + +```sh +$PYPE_PROJECT_CONFIGS/FooPoject/presets/plugins/maya/publish.json +``` + +And its done. **ValidateMeshHasOverlappingUVs** is a class name of validator - you can +find that name by looking into python file containing validator code, or in Pyblish GUI. + +That way you can make it optional or set whatever properties you want on plugins and those +settings will take precedence over the default site-wide settings. diff --git a/website/docs/pype2/admin_ftrack.md b/website/docs/pype2/admin_ftrack.md new file mode 100644 index 0000000000..d321caf870 --- /dev/null +++ b/website/docs/pype2/admin_ftrack.md @@ -0,0 +1,203 @@ +--- +id: admin_ftrack +title: Ftrack Setup +sidebar_label: Ftrack Setup +--- + +import Tabs from '@theme/Tabs'; +import TabItem from '@theme/TabItem'; + + +Ftrack is currently the main project management option for Pype. This documentaion assumes that you are familiar with Ftrack and it's basic principles. If you're new to Ftrack, we recommend having a thorough look at [Ftrack Official Documentation](http://ftrack.rtd.ftrack.com/en/stable/). + +## Prepare Ftrack for Pype + +If you want to connect Ftrack to Pype you might need to make few changes in Ftrack settings. These changes would take a long time to do manually, so we prepared a few Ftrack actions to help you out. First, you'll need to launch Pype's tray application and set [Ftrack credentials](#credentials) to be able to run our Ftrack actions. + +The only action that is strictly required is [Pype Admin - Create/Update Avalon Attributes](manager_ftrack_actions#create-update-avalon-attributes), which creates and sets the Custom Attributes necessary needed for Pype to function. If you want to use pype only for new projects then you should read about best practice with [new project](#new-project). + +If you want to switch projects that are already in production, you might also need to run [Pype Doctor - Custom attr doc](manager_ftrack_actions#custom-attr-doc). + +:::caution +Keep in mind that **Custom attr doc** action will migrate certain attributes from ftrack default ones to our custom attributes. Some attributes will also be renamed. We make backup of the values, but be very carefull with this option and consults us before running it. +::: + +## Event Server + +Ftrack Event Server is the key to automation of many tasks like _status change_, _thumbnail update_, _automatic synchronization to Avalon database_ and many more. Event server should run at all times to perform all the required processing as it is not possible to catch some of them retrospectively with enough certainty. + +### Running event server + +There are specific launch arguments for event server. With `$PYPE_SETUP/pype eventserver` you can launch event server but without prior preparation it will terminate immediately. The reason is that event server requires 3 pieces of information: _Ftrack server url_, _paths to events_ and _Credentials (Username and API key)_. Ftrack server URL and Event path are set from Pype's environments by default, but the credentials must be done separatelly for security reasons. + + + +:::note There are 2 ways of passing your credentials to event server. + + + + + +- **`--ftrack-user "your.username"`** : Ftrack Username +- **`--ftrack-api-key "00000aaa-11bb-22cc-33dd-444444eeeee"`** : User's API key +- **`--store-crededentials`** : Entered credentials will be stored for next launch with this argument _(It is not needed to enter **ftrackuser** and **ftrackapikey** args on next launch)_ +- **`--no-stored-credentials`** : Stored credentials are loaded first so if you want to change credentials use this argument +- `--ftrack-url "https://yourdomain.ftrackapp.com/"` : Ftrack server URL _(it is not needed to enter if you have set `FTRACK_SERVER` in Pype' environments)_ +- `--ftrack-events-path "//Paths/To/Events/"` : Paths to events folder. May contain multiple paths separated by `;`. _(it is not needed to enter if you have set `FTRACK_EVENTS_PATH` in Pype' environments)_ + +So if you want to use Pype's environments then you can launch event server for first time with these arguments `$PYPE_SETUP/pype eventserver --ftrack-user "my.username" --ftrack-api-key "00000aaa-11bb-22cc-33dd-444444eeeee" --store-credentials`. Since that time, if everything was entered correctly, you can launch event server with `$PYPE_SETUP/pype eventserver`. + + + + +- `FTRACK_API_USER` - Username _("your.username")_ +- `FTRACK_API_KEY` - User's API key _("00000aaa-11bb-22cc-33dd-444444eeeee")_ +- `FTRACK_SERVER` - Ftrack server url _(")_ +- `FTRACK_EVENTS_PATH` - Paths to events _("//Paths/To/Events/")_ + We do not recommend you this way. + + + +::: + +:::caution +We do not recommend setting your ftrack user and api key environments in a persistent way, for security reasons. Option 1. passing them as arguments is substantially safer. +::: + +### Where to run event server + +We recommend you to run event server on stable server machine with ability to connect to Avalon database and Ftrack web server. Best practice we recommend is to run event server as service. + +:::important +Event server should **not** run more than once! It may cause big pipeline issues. +::: + +### Which user to use + +- must have at least `Administrator` role +- same user should not be used by an artist + +### Run Linux service - step by step + +1. create file: + `sudo vi /opt/pype/run_event_server.sh` + +2. add content to the file: + +```sh +export PYPE_DEBUG=3 +pushd /mnt/pipeline/prod/pype-setup +. pype eventserver --ftrack-user --ftrack-api-key +``` + +3. create service file: + `sudo vi /etc/systemd/system/pype-ftrack-event-server.service` + +4. add content to the service file + +```toml +[Unit] +Description=Run Pype Ftrack Event Server Service +After=network.target + +[Service] +Type=idle +ExecStart=/opt/pype/run_event_server.sh +Restart=on-failure +RestartSec=10s + +[Install] +WantedBy=multi-user.target +``` + +5. change file permission: + `sudo chmod 0755 /etc/systemd/system/pype-ftrack-event-server.service` + +6. enable service: + `sudo systemctl enable pype-ftrack-event-server` + +7. start service: + `sudo systemctl start pype-ftrack-event-server` + +* * * + +## Ftrack events + +Events are helpers to automation. They react to Ftrack Web Server events like change entity attribute, create of entity, etc. . + +### Delete Avalon ID from new entity _(DelAvalonIdFromNew)_ + +Is used to remove value from `Avalon/Mongo Id` Custom Attribute when entity is created. + +`Avalon/Mongo Id` Custom Attribute stores id of synchronized entities in pipeline database. When user _Copy -> Paste_ selection of entities to create similar hierarchy entities, values from Custom Attributes are copied too. That causes issues during synchronization because there are multiple entities with same value of `Avalon/Mongo Id`. To avoid this error we preventively remove these values when entity is created. + +### Next Task update _(NextTaskUpdate)_ + +Change status of next task from `Not started` to `Ready` when previous task is approved. + +Multiple detailed rules for next task update can be configured in the presets. + +### Synchronization to Avalon database _(Sync_to_Avalon)_ + +Automatic [synchronization to pipeline database](manager_ftrack#synchronization-to-avalon-database). + +This event updates entities on their changes Ftrack. When new entity is created or existing entity is modified. Interface with listing information is shown to users when [synchronization rules](manager_ftrack#synchronization-rules) are not met. This event may also undo changes when they might break pipeline. Namely _change name of synchronized entity_, _move synchronized entity in hierarchy_. + +:::important +Deleting an entity by Ftrack's default is not processed for security reasons _(to delete entity use [Delete Asset/Subset action](manager_ftrack_actions#delete-asset-subset))_. +::: + +### Synchronize hierarchical attributes _(SyncHierarchicalAttrs)_ + +Auto-synchronization of hierarchical attributes from Ftrack entities. + +Related to [Synchronize to Avalon database](#synchronization-to-avalon-database) event _(without it, it makes no sense to use this event)_. Hierarchical attributes must be synchronized with special way so we needed to split synchronization into 2 parts. There are [synchronization rules](manager_ftrack#synchronization-rules) for hierarchical attributes that must be met otherwise interface with messages about not meeting conditions is shown to user. + +### Thumbnails update _(ThumbnailEvents)_ + +Updates thumbnail of Task and it's parent when new Asset Version with thumbnail is created. + +This is normally done by Ftrack Web server when Asset Version is created with Drag&Drop but not when created with Ftrack API. + +### Version to Task status _(VersionToTaskStatus)_ + +Updates Task status based on status changes on it's `AssetVersion`. + +The issue this solves is when Asset version's status is changed but the artist assigned to Task is looking at the task status, thus not noticing the review. + +This event makes sure statuses Asset Version get synced to it's task. After changing a status on version, this event first tries to set identical status to version's parent (usually task). At this moment there are a few more status mappings hardcoded into the system. If Asset version's status was changed to: + +- `Reviewed` then Task's status will be changed to `Change requested` +- `Approved` then Task's status will be changed to `Complete` + + +### Update First Version status _(FirstVersionStatus)_ + +This event handler allows setting of different status to a first created Asset Version in ftrack. + +This is usefull for example if first version publish doesn't contain any actual reviewable work, but is only used for roundtrip conform check, in which case this version could receive status `pending conform` instead of standard `pending review` + +Behaviour can be filtered by `name` or `type` of the task assigned to the Asset Version. Configuration can be found in [ftrack presets](admin_presets_ftrack#first_version_status-dict) + +* * * + +## Credentials + +If you want to be able use Ftrack actions with Pype tray or [event server](#event-server) you need to enter credentials. The credentials required for Ftrack are `Username` and `API key`. + +### Credentials in tray + +How to handle with credentials in tray is described [here](#artist_ftrack#first-use-best-case-scenario). + +### Credentials in event server + +How to enter credentials to event server is described [here](#how-to-run-event-server). + +### Where to find API key + +Please check the [official documentation](http://ftrack.rtd.ftrack.com/en/backlog-scaling-ftrack-documentation-story/developing/api_keys.html). diff --git a/website/docs/pype2/admin_hosts.md b/website/docs/pype2/admin_hosts.md new file mode 100644 index 0000000000..24efef7f05 --- /dev/null +++ b/website/docs/pype2/admin_hosts.md @@ -0,0 +1,260 @@ +--- +id: admin_hosts +title: Hosts Setup +sidebar_label: Hosts Setup +--- + +## Host configuration + +To add new host application (for example new version of Autodesk Maya, etc.) just follow these steps: + +### Launchers + +You can find **launchers** in `repos/pype-config`. You can notice there is a bunch of **[TOML](https://en.wikipedia.org/wiki/TOML)** files and Linux and Windows shell scripts in their respective folders. **TOML** file +holds basic metadata information for host application. Their naming convention is important and follow this pattern: + +```fix +app_name[_version].toml +``` + +for example `maya_2020.toml` or `nuke_11.3.toml`. More about it later. For now, lets look on content of one of these files: + +```toml +executable = "unreal" +schema = "avalon-core:application-1.0" +application_dir = "unreal" +label = "Unreal Editor 4.24" +ftrack_label = "UnrealEditor" +icon ="ue4_icon" +launch_hook = "pype/hooks/unreal/unreal_prelaunch.py/UnrealPrelaunch" +ftrack_icon = '{}/app_icons/ue4.png' +``` + +* `executable` - specifies name (without extension) of shell script launching application (in windows/linux/darwin folders) +* `schema` - not important, specifying type of metadata +* `application_dir` - this specifies name of folder used in **app** key in [anatomy templates](admin_config#anatomy) +* `label` - name of application to show in launcher +* `ftrack_label` - name under which this application is show in ftrack actions (grouped by) +* `icon` - application icon used in avalon launcher +* `launch_hook` - path to Python code to execute before application is started (currently only from ftrack action) +* `ftrack_icon` - icon used in ftrack + +### Environments + +You can modify environment variables for you application in `repos/pype-config/environments`. Those files are +[JSON](https://en.wikipedia.org/wiki/JSON) files. Those file are loaded and processed in somewhat hierarchical way. For example - for Autodesk Maya 2020, first file named `maya.json` is processed and then `maya_2020.json` is. Syntax is following: + +```json +{ + "VARIABLE": "123", + "NEXT_VARIABLE": "{VARIABLE}4", + "PLATFORMS": { + "windows": "set_on_windows", + "linux": "set_on_linux", + "darwin": "set_on_max" + }, + "PATHS: [ + "paths/1", "path/2", "path/3" + ] +} +``` + +This will result on windows in environment with: + +```sh +VARIABLE="123" +NEXT_VARIABLE="1234" +PLATFORMS="set_on_windows" +PATHS="path/1;path/2;path/3" +``` + +### Ftrack + +You need to add your new application to ftrack so it knows about it. This is done in System Preferences of +ftrack in `Advanced:Custom Attributes`. There you can find `applications` attribute. It looks like this: + +![Ftrack - custom attributes - applications](../assets/ftrack/ftrack-custom_attrib_apps.jpg) + +Menu/value consists of two rows per application - first row is application name and second is basically filename of this **TOML** file mentioned above without `.toml` extension. After you add or modify whatever you need here, you need to add you new application to project in ftrack. Just open project Info in ftrack, find out +**Applications** and add your new application there. If you are running [event server](admin_ftrack#event-server) then this information is synced to avalon automatically. If not, you need to sync it manually by running **Sync to Avalon** action. + +Now, restart Pype and your application should be ready. + +### Conclusion + +To wrap it up: + +- create your shell scripts to launch application (don't forget to set correct OS permissions) +- create **TOML** file pointing to shell scripts, set you icons and labels there +- check or create you environment **JSON** file in `environments` even if it is empty (`{}`) +- to make it work with ftrack, modify **applications** in *Custom Attributes*, add it to your project and sync +- restart Pype + +## Autodesk Maya + +[Autodesk Maya](https://www.autodesk.com/products/maya/overview) is supported out of the box and doesn't require any special setup. Even though everything should be ready to go from the start, here is the checklist to get pype running in Maya + +1. Correct executable in launchers as explained in [here](admin_config#launchers) +2. Pype environment variable added to `PYTHONPATH` key in `maya.json` environment preset. +```json +{ + "PYTHONPATH": [ + "{PYPE_ROOT}/repos/avalon-core/setup/maya", + "{PYPE_ROOT}/repos/maya-look-assigner" + ] +} +``` + + +## Foundry Nuke + +[Foundry Nuke](https://www.foundry.com/products/nuke) is supported out of the box and doesn't require any special setup. Even though everything should be ready to go from the start, here is the checklist to get pype running in Nuke + +1. Correct executable in launchers as explained in [here](admin_config#launchers) +2. Following environment variables in `nuke.json` environment file. (PYTHONPATH might need to be changed in different studio setups) + +```json +{ + "NUKE_PATH": [ + "{PYPE_ROOT}/repos/avalon-core/setup/nuke/nuke_path", + "{PYPE_MODULE_ROOT}/setup/nuke/nuke_path", + "{PYPE_STUDIO_PLUGINS}/nuke" + ], + "PYPE_LOG_NO_COLORS": "True", + "PYTHONPATH": { + "windows": "{VIRTUAL_ENV}/Lib/site-packages", + "linux": "{VIRTUAL_ENV}/lib/python3.6/site-packages" + } +} +``` + + + +## AWS Thinkbox Deadline + +To support [AWS Thinkbox Deadline](https://www.awsthinkbox.com/deadline) you just need to: + +1. enable it in **init_env** key of your `deploy.json` file: + +```json +{ + "PYPE_CONFIG": "{PYPE_ROOT}/repos/pype-config", + "init_env": ["global", "avalon", "ftrack", "deadline"] +} +``` + +2. Edit `repos/pype-config/environments/deadline.json` and change `DEADLINE_REST_URL` to point to your Deadline Web API service. + +3. Set up *Deadline Web API service*. For more details on how to do it, see [here](https://docs.thinkboxsoftware.com/products/deadline/10.0/1_User%20Manual/manual/web-service.html). + +### Pype Dealine supplement code + +There is some code needed to be installed on Deadline repository. You can find this repository overlay in +`pype-setup/vendor/deadline`. This whole directory can be copied to your existing deadline repository. + +Currently there is just **GlobalJobPreLoad.py** script taking care of path remapping in case of multiplatform +machine setup on farm. If there is no mix of windows/linux machines on farm, there is no need to use this. + +## Virtual Vertex Muster + +Pype supports rendering with [Muster](https://www.vvertex.com/). To enable it: +1. Add `muster` to **init_env** to your `deploy.json` + file: + +```json +{ + "PYPE_CONFIG": "{PYPE_ROOT}/repos/pype-config", + "init_env": ["global", "avalon", "ftrack", "muster"] +} +``` + +2. Configure URL to Muster Web API - in `repos/pype-config/environments/muster.json`. There you need to set `MUSTER_REST_URL` to correct value. + +3. Enabled muster in [tray presets](admin_presets_tools##item_usage-dict) + +#### Template mapping + +For setting up muster templates have a look at [Muster Template preset](admin_presets_tools#muster-templates) + +:::note +User will be asked for it's Muster login credentials during Pype startup or any time later if its authentication token expires. +::: + + +## Clockify + +[Clockify](https://clockify.me/) integration allows pype users to seamlessly log their time into clockify in the background. This in turn allow project managers to have better overview of all logged times with clockify dashboards and analytics. + +1. Enable clockify, add `clockify` to **init_env** in your `deploy.json` + file: + +```json +{ + "PYPE_CONFIG": "{PYPE_ROOT}/repos/pype-config", + "init_env": ["global", "avalon", "ftrack", "clockify"] +} +``` + +2. Configure your clockify workspace. In `repos/pype-config/environments/clockify.json`, you need to change `CLOCKIFY_WORKSPACE` to the correct value + +```json +{ + "CLOCKIFY_WORKSPACE": "test_workspace" +} +``` + +3. Enabled Clockify in [tray presets](admin_presets_tools##item_usage-dict) + + +:::note +User will be asked for it's Clockify login credentials during Pype startup. +::: + + +## Unreal Editor + +Pype supports [Unreal](https://www.unrealengine.com/). This support is currently tested only on Windows platform. +You can control Unreal behavior by editing `repos/pype-config/presets/unreal/project_setup.json`: + +```json +{ + "dev_mode": false, + "install_unreal_python_engine": false +} +``` + +Setting `dev_mode` to **true** will make all new projects created on tasks by pype C++ projects. To work with those, +you need [Visual Studio](https://visualstudio.microsoft.com/) installed. + +`install_unreal_python_engine` will install [20tab/UnrealEnginePython](https://github.com/20tab/UnrealEnginePython) as plugin +in new project. This implies `dev_mode`. Note that **UnrealEnginePython** is compatible only with specific versions of Unreal Engine (usually not with the latest one). This plugin is not needed but can be used along *"standard"* python support in Unreal Engine to +extend Pype or Avalon functionality. + +### Unreal Engine version detection + +Pype is trying to automatically find installed Unreal Engine versions. This relies on [Epic Games Launcher](https://www.epicgames.com/store/en-US/). +If you have custom install location (for example you've built your own version from sources), you can set +`UNREAL_ENGINE_LOCATION` to point there. Pype then tries to find UE version in `UE_x.xx` subfolders. + +### Avalon Unreal Integration plugin + +Avalon/Pype integration needs [Avalon Unreal Integration Plugin](https://github.com/pypeclub/avalon-unreal-integration). Use `AVALON_UNREAL_PLUGIN` environment variable to point to it. When new +UE project is created, file are copied from this directory to project `Plugins`. If Pype detects that plugin +isn't already built, it will copy its source codes to new project and force `dev_mode`. In that case, you need +**Visual Studio** to compile the plugin along with the project code. + +### Dependencies + +Pype integration needs: + +* *Python Script Plugin enabled* (done automatically) +* *Editor Scripting Utilities* (done automatically) +* *PySide* installed in Unreal Python 2 (or PySide2/PyQt5 if you've build Unreal Editor with Python 3 support) (done automatically) +* *Avalon Unreal Integration plugin* ([sources are on GitHub](https://github.com/pypeclub/avalon-unreal-integration)) +* *Visual Studio 2017* is needed to build *Avalon Unreal Integration Plugin* and/or if you need to work in `dev_mode` + +### Environment Variables + +- `AVALON_UNREAL_EDITOR` points to Avalon Unreal Integration Plugin sources/build +- `UNREAL_ENGINE_LOCATION` to override Pype autodetection and point to custom Unreal intallation +- `PYPE_UNREAL_ENGINE_PYTHON_PLUGIN` path to [20tab/UnrealEnginePython](https://github.com/20tab/UnrealEnginePython) optional plugin diff --git a/website/docs/pype2/admin_install.md b/website/docs/pype2/admin_install.md new file mode 100644 index 0000000000..dad0d19b50 --- /dev/null +++ b/website/docs/pype2/admin_install.md @@ -0,0 +1,430 @@ +--- +id: admin_install +title: Pype Setup +sidebar_label: Pype Setup +--- + +import Tabs from '@theme/Tabs'; +import TabItem from '@theme/TabItem'; + +## Introduction + +The general approach to pype deployment is installing central repositories on a shared network storage which can be accessed by all artists in the studio. Simple shortcuts to launchers are then distributed to all workstations for artists to use. This approach ensures easy maintenance and updates. + +When artist first runs pype all the required python packages get installed automatically to his local workstation and updated everytime there is a change in the central installation. + +:::note +Automatic workstation installation and updates will not work in offline scenarios. In these case `pype install --force --offline` command must be triggered explicitly on the workstation +::: + +## Requirements + +### Python 3.6+ + +Pype requires Python 3.6 or later to be installed on each workstation running Pype. + +:::note +If you want to use pype with Blender, you need to upgrade your python to 3.7 or higher. +::: + +Windows version of Python can be easily grabbed at [python.org](https://www.python.org/downloads/). Install location doesn't matter but +python executable should be in `PATH` environment variable. + +:::important Linux +On linux it is somehow different and all depends on linux distribution in use. + +Some linux variants (for example *Ubuntu*) need **python-dev** variant of python package that includes python headers and developer tools. This is needed because some of **Pype** requirements need to compile themselves against python during their installation. Please, refer to your distribution community to find out how to install that package. +::: + + + + + + +```sh +sudo yum group install "Development Tools" +``` + +Python 3.6 is not part of official distribution. Easiest way is to add it with the help of *SCL* - Software Collection project. +This has advantage that it won't replace system version of python. + +```sh +sudo yum update +sudo yum install centos-release-scl +``` +Now you can install python itself: +```sh +sudo yum install rh-python36 +``` + +To be able to use installed version of python, you must enable it in shell: +```sh +scl enable rh-python36 bash +``` + +This will enable python 3.6 in currently running bash only! + +Check it with: +```sh +python --version +``` + + + + +```sh +sudo apt install build-essential +``` + +Some versions of Ubuntu already has python 3.6 installed, check it with: +```sh +python3 --version +``` +If python shows lower version then required, use: +``` +sudo apt-get update +sudo apt-get install python3-dev +``` +Please be aware that even if your system already has python 3.6, than if that +didn't come from **python3-dev** package, Pype will most likely fail to install +it's dependencies. + + + + + +:::note Override Python detection +You can override autodetection of Python. This can be useful if you want to use central network python location or some other custom location. Just set `PYPE_PYTHON_EXE` environment variable to point where you need. +::: + +-------------- + +### MongoDB + +Pype needs site-wide installation of **MongoDB**. It should be installed on +reliable server all workstations (and possibly render nodes) can connect. This +server holds **Avalon** database that is at the core of everything, containing +very important data, so it should be backed up often and if high-availability is +needed, *replication* feature of **MongoDB** should be considered. This is beyond the +scope of this documentation, please refer to [MongoDB Documentation](https://docs.mongodb.com/manual/replication/). + +Pype can run it's own instance of **mongodb**, mostly for testing and development purposes. +For that it uses locally installed **MongoDB**. + +Download it from [mognoDB website](https://www.mongodb.com/download-center/community), install it and +add to the `PATH`. On Windows, Pype tries to find it in standard installation destination or using `PATH`. + +To run **mongoDB** on server, use your server distribution tools to set it up (on Linux). + +### Git + +To be able to deploy Pype, **git** is need. It will clone all required repositories and +control versions so future updates are easier. Git is however only requirent on admin workstation for global studio updates. + +See [how to install git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git). + +To access private repositories, you'll need other optional stuff like ssh key agents, etc. + +### PowerShell (on Windows only) + +PowerShell is now included in recent versions of Windows. **Pype** requires at least +version 5.0, included in Windows 10 from beginning and available for Windows 7 SP1, +Windows 8.1 and Windows Server 2012. + +If you want to know what version of PowerShell are you running, execute in PowerShell prompt: +```powershell +$PSVersionTable +``` + If you need to install PowerShell or update it, please refer to: + [Installing powershell on windows](https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell?view=powershell-6) + +### Xcode CLT (on Mac only) + +Pype need **Xcode Command Line Tools** installed to provide its tools and be able to install its dependencies via pythons `pip` command. Those will be downloaded +and installed automatically if needed. + +### Other +:::warning Linux headless server +If you need to run Pype's **ftrack event server** on headless linux server, be aware that due Qt dependencies, you'll need to install OpenGL support there even if server doesn't have any real use for it. +::: + +## Studio Setup + +### Pype location + +Before you install Pype, first clone **pype-setup** repository to place you want Pype to be. In studio setting +you probably want that destination to be on shared network drive so all users can access it. + +:::tip production and development branch +We recommend to maintain two *versions* of Pype. The first is **production** branch - the one your artists use everyday for their work. The second one is **development** version you should use for testing new features and as development sandbox. Development branch can point to a different Avalon database and use its own **ftrack event server**. More on that in [Pype Configuration](admin_config) + +```text +Shared Network Drive +├─── pype + ├─── prod + └─── dev +``` + +To prepare this structure, you can use: +```sh +cd /shared_drive/pype +git clone --tag 2.4.0 https://bitbucket.com/pypeclub/pype-setup.git prod +git clone --tag 2.4.0 https://bitbucket.com/pypeclub/pype-setup.git dev +``` +::: + +Specify your version after `--branch` or `--tag` option. + +:::note +It is possible to distinguish `dev` and `prod` by changing Pype icon color to orange. To do so, you have to create `config.ini` file with content: +```text +[DEFAULT] +dev=true +``` + +And put the file to: +```text +Shared Network Drive +├─── dev + └─── pype-setup + └───pypeapp + └───config.ini +``` +::: + +:::note +You should always use tags to checkout to get specific release, otherwise you end up with *develop* branch that can be unstable. +::: + +:::warning +By default, both branches will use the same virtual environment. Be careful when modifying your requirements in **dev** version because then it will influence **prod** version as well. To be safe, modify `PYPE_ENV` environment variable before using **dev** Pype commands. +::: + +### Installation + + + + + + +To install Pype you need to get first to it's root directory in powershell. + +If you have Pype on network, you should mount it as drive and assign it some consistent letter. You can also mount this network drive via junction point feature. As admin run from shell: + +```sh +mklink /d "C:\pipeline" "\\server\pipeline" +``` +Then your network drive will be available transparently at `C:\pipeline`. + +```sh +cd Z:\pype\production\pype-setup +``` +----- + +Now you can run installation itself: +```sh +.\pype.bat install +``` + + + + +To install pype you first need get to it's root directory in bash shell. +If you Pype location is on network drive, you should add it to `/etc/fstab` to +mount it automatically during system startup. +```sh +cd /location/of/pype +``` + +**Pype** can be installed with the following command: + +```sh +. pype install +``` + +On linux it is necessary to adjust user permissions to `/opt/pype/pype_env2` or whatever you set in `PYPE_ENV` and for that you need to be **root**. + + +#### Mounting network drives +If you Pype location is on network drive, you need to mount it first. Here are the steps to do it and make it so it re-mounts automatically after your computer restarts: + +1) in Finder press **Command+K** +2) enter path `smb://server/pipeline` and hit **Connect** +3) enter login and password +4) network drive is now mounted under `/Volumes/pipeline` +5) now go to **System Preferences** +6) click **Users & Groups -> Login Items** +7) click + and select mounted drive and click **Add** + + + + + +To install Pype on Mac, you need to have Administrator privileges. There are also further requirements if you need to deploy repositories. + +Run **Terminal**. Run following commands: +```sh +sudo -s +cd /Volumes/pipeline/pype/production/pype-setup +./pype install +``` + +`sudo -s` will take you to elevated privileges and you need to enter your password. `cd` will change directory to where you have pype located and `pype install` will run installation. + +If there are then warnings about some directory not owned by current user, you can fix it with following commands: + +```sh +chown -R yourusername /usr/local/pype +chown -R yourusername /Users/yourusername/Library/Caches/pip +``` +Switch `yourusername` for your user name :) + + + + + +What it basically does is: +1) Create python virtual environment on path: `C:\Users\Public\pype_env2` on Windows or `/opt/pype/pype_env2` on Linux or `/usr/local/pype/pype_env2` on Mac. +This can be overridden by setting `PYPE_ENV` to different path. Logic behind this is that this directory on Windows can be shared +between users on one machine - it only stores Pype dependencies, not any personal setting or credentials. + +2) Then it will install all python dependencies defined in `pypeapp\requirements.txt` into this virtual environment. + +Default installation will use your internet connection to download all necessary requirements. + +#### Offline installation + +You can also install Pype in offline scenarios: + +```sh +pype install --offline +``` + +This will use dependencies downloaded into `pype-setup/vendor/packages` rather than pulling directly from the internet. Those packages must, however, first be +downloaded on a machine connected to the internet using: + +```sh +pype download +``` + +:::warning multiple platforms +`pype download` will only download packages for currently running platform. So if you run it on Windows machine, only windows packages get downloaded (along with many universal ones). If you then run `pype install --offline` on Linux machine, it will probably fail as Linux specific packages will be missing. In multiplatform environments we recommend to run `pype download` on all used platform to combine all necessary packages into `vendor/packages`. +::: + +:::caution multiplatform caveat +There can be problems with libraries compatibility, when using multiplatform environments. For example if using **PyQt 5.12**, there seems to be no problem on Windows, but using it on **Centos Linux 7** will cause problems because Centos ships with some older dependent libraries that will not work with aforementioned PyQt version. +::: + +#### Forcing Installation + +Sometime it is necessary to force re-install Pype environment. To do this: + +```sh +pype install --force +``` + +or + +```sh +pype install --force --offline +``` +in offline scenarios. + +This is useful if Pype is misbehaving as first line of debugging. You can of course just manually delete `PYPE_ENV` directory and run `pype install` again. + +### Deployment + +After Pype is cloned and installed, it is necessary to *deploy* all repositories used by Pype. This must be done on a computer with +Internet access. + +```sh +pype deploy +``` + +This command will process all repositories specified in `deploy/deploy.json` and clone them into `repos/` directory. + +```sh +pype deploy --force +``` + +will deploy repositories, overwriting existing ones if they exists and setting them to state specified in *deploy.json*. + +:::note customizing deployment +You can customize your deployment to some extent. Everything specified in `deploy/deploy.json` is considered as default and can be overridden by creating your own *deploy.json* in sub directory. +```text +pype + ├─── pypeapp + ├─── deploy + │ ├─── deploy.json + │ ├─── deploy_schema-1.0.json + │ ├─── my_studio_override + │ │ ├─── deploy.json + │ │ └─── deploy_schema-1.0.json + │ ... +... +``` +In such configuration, `deploy/my_studio_override/deploy.json` will take precedence over the default one. +::: + +To validate if Pype deployment is ok, run: + +```sh +pype validate +``` + +#### Structure of `deploy.json` + +There are a few features in `deploy.json` that needs to be explained in further detail. + +Here is a list of keys used and their function: + +- `PYPE_CONFIG` - path to Pype configuration repository. +- `init_env` - these are environment files in Pype configuration repository that + are loaded immediately after Pype starts. They define basic functionality. + ```js + "init_env": ["global", "avalon", "ftrack", "deadline"] + ``` + For example, if you don't use *Deadline* but you need *Muster* support, change `deadline` to `muster`. + Pype will then load `{PYPE_CONFIG}/environments/muster.json` and set environment variables there. +- `repositories`: this is list of repositories that will be deployed to `repos/`. There are few options + for each repository: + + - `name`: name of repository will be used as directory name + - `url`: url of the git repository + - `branch` or `tag`: this specify either branch - it's *HEAD* will be checked out, or + `tag` - commit tagged with specified tag will be checked out. + +- `pip`: these are additional dependencies to be installed by *pip* to virtual environment. +- `archive_files`: archive files to be unpacked to somewhere. For example ffmpeg installation or + anything else we need to extract during deployment to some place. + + - `extract_path`: path to where this archive should be extracted + - `url` or `vendor`: this is url of source to be downloaded or name in `vendor/packages` to be Used + - `md5_url` optional url for md5 file to validate checksum of downloaded file + - `skip_first_subfolder` will move everything inside first directory in archive to `extract_path`. + +#### Offline Deployment + +In offline scenarios it is up to you to replicate what `pype deploy` does. The easiest way +to go is to run `pype deploy` on machine, get everything in `repos/` and move it to your studio install location: + +```sh +cd pype-setup +tar cvzf pype_repos.tgz repos/ +``` + +do the same for things deployed to *vendor*. diff --git a/website/docs/pype2/admin_introduction.md b/website/docs/pype2/admin_introduction.md new file mode 100644 index 0000000000..7a3b8f51d8 --- /dev/null +++ b/website/docs/pype2/admin_introduction.md @@ -0,0 +1,71 @@ +--- +id: admin_getting_started +title: Getting Started +sidebar_label: Getting Started +--- + +## Introduction + +**Pype** is part of a larger ecosystem of tools build around [avalon](https://github.com/getavalon/core) and [pyblish](https://github.com/pyblish/pyblish-base). +To be able to use it, you need those tools and set your environment. This +requires additional software installed and set up correctly on your system. + +Fortunately this daunting task is handled for you by **Pype Setup** package itself. **Pype** can +install most of its requirements automatically but a few more things are needed in +various usage scenarios. + +## Software requirements + +- **Python 3.7+** (Locally on all workstations) +- **PowerShell 5.0+** (Windows only) +- **Bash** (Linux only) +- **MongoDB** (Centrally accessible) + +There are other requirements for different advanced scenarios. For more +complete guide please refer to [Pype Setup page](admin_install). + + +## Hardware requirements + +Pype should be installed centrally on a fast network storage with at least read access right for all workstations and users in the Studio. Full Deplyoyment with all dependencies and both Development and Production branches installed takes about 1GB of data, however to ensure smooth updates and general working comfort, we recommend allocating at least at least 4GB of storage dedicated to PYPE deployment. + +For well functioning ftrack event server, we recommend a linux virtual server with Ubuntu or Centos OS. CPU and RAM allocation need differ based on the studio size, but a 2GB of ram, with a dual core CPU and around 4GB of storage should suffice + +## Central repositories + +### Pype-setup + +Pype-Setup is the glue that binds Avalon, Pype and the Studio together. It is essentially a wrapper application that manages requirements, installation, all the environments and runs all of our standalone tools. + +It has two main interfaces. `Pype` CLI command for all admin level tasks and a `Pype Tray` application for artists. Documentation for the `Pype` command can be found [here](admin_pype_commands) + +This is also the only repository that needs to be downloaded by hand before full pype deployment can take place. + +### Pype + +Pype is our "Avalon Config" in Avalon terms that takes avalon-core and expands on it's default features and capabilities. This is where vast majority of the code that works with your data lives. + +Avalon gives us the ability to work with a certain host, say Maya, in a standardised manner, but Pype defines **how** we work with all the data. You can think of it as. Avalon by default expects each studio to have their own avalon config, which is reasonable considering all studios have slightly different requirements and workflows. We abstracted a lot of this customisability out of the avalon config by allowing pype behaviour to be altered by a set of .json based configuration files and presets. + +Thanks to that, we are able to maintain one codebase for vast majority of the features across all our clients deployments while keeping the option to tailor the pipeline to each individual studio. + +### Avalon-core + +Avalon-core is the heart and soul of Pype. It provides the base functionality including GUIs (albeit expanded modified by us), database connection and maintenance, standards for data structures and working with entities and a lot of universal tools. + +Avalon is being very actively developed and maintained by a community of studios and TDs from around the world, with Pype Club team being an active contributor as well. + +## Studio Specific Repositories + +### Pype-Config + +Pype_config repository need to be prepared and maintained for each studio using pype and holds all of their specific requiremens for pype. Those range from naming conventions and folder structures (in pype referred to as `project anatomy`), through colour management, data preferences, all the way to what individual validators they want to use and what they are validating against. + +Thanks to a very flexible and extensible system of presets, we're almost always able to accommodate client requests for modified behaviour by introducing new presets, rather than permanently altering the main codebase for everyone. + + +### Studio-Project-Configs + +On top of studio wide pype config, we support project level overrides for any and all avriables and presets available in the main studio config. + +### Studio-Project-Scrips diff --git a/website/docs/pype2/admin_presets_ftrack.md b/website/docs/pype2/admin_presets_ftrack.md new file mode 100644 index 0000000000..793812dc2c --- /dev/null +++ b/website/docs/pype2/admin_presets_ftrack.md @@ -0,0 +1,119 @@ +--- +id: admin_presets_ftrack +title: Presets > Ftrack +sidebar_label: Ftrack +--- + +## PROJECT_DEFAULTS.json + +path: `pype-config/presets/ftrack/project_defauls.json` + +A list of all project defaults to be set when you run "Ftrack Prepare Project" + +```json +{ + "fps": 25, + "frameStart": 1001, + "frameEnd": 1100, + "clipIn": 1001, + "clipOut": 1100, + "handleStart": 10, + "handleEnd": 10, + + "resolutionHeight": 1080, + "resolutionWidth": 1920, + "pixelAspect": 1.0, + "applications": [ + "maya_2019", "nuke_11.3", "nukex_11.3", "nukestudio_11.3", "deadline" + ], + "tools_env": [], + "avalon_auto_sync": true +} +``` + +## FTRACK_CONFIG.json + +path: `pype-config/presets/ftrack/ftrack_config.json` + +### `sync_to_avalon` [dict] + +list of statuses that allow moving, deleting and changing of names on ftrack entities. Once any child of and entity is set to a status different than those listed in this list, it is considered to have been worked on and will not allow any major changes to hierarchy any more. + +`statuses_name_change [list]`: + +```json +{ + "sync_to_avalon": { + "statuses_name_change": ["not ready", "ready"] + } +} +``` + +### `status_update` [dict] + +mapping of status for automatic updates. +Key specifies the resulting status and value is a list of statuses from which we allow changing to the target status. + +`_ignore_` [list]: source statuses to ignore + +`target_status` [list]: target + +```json +{ + "status_update": { + "_ignore_": ["in progress", "ommited", "on hold"], + "Ready": ["not ready"], + "In Progress" : ["_any_"] + } +} +``` + +### `status_version_to_task` [dict] + +mapping of status that propagate automatically from published version to it's task. By default we search for identical status, however this preset let's you remap between different statuses on versions and tasks. + + +`status_version_to_task` [dict]: + +```json +{ + "status_version_to_task": { + "__description__": "Status `from` (key) must be lowered!", + "in progress": "in progress", + "approved": "approved" + } +} +``` + +## SERVER.json + +path: `pype-config/presets/ftrack/server.json` + +### `first_version_status` [dict] + +`task_status_map` [list]: List of dictionaires specifying individual mappings + +`status` [string]: status to set if `key` and `name` match. + +`name` [string]: name of task or task's type. + +`key` [enumerator]: _optional_ specify where to look for name. There are two possible value: + 1. `task`: task's name (default) + 2. `task_type`: task type's name + +It doesn't matter if values are lowered or capitalized. + +```json +{ + "FirstVersionStatus": { + "task_status_map": [{ + "key": "task", + "name": "compositing", + "status": "Blocking" + }, { + "MORE ITEMS...": "MORE VALUES..." + }] + }, + "...": "{...}" +} +``` diff --git a/website/docs/pype2/admin_presets_maya.md b/website/docs/pype2/admin_presets_maya.md new file mode 100644 index 0000000000..52717873d2 --- /dev/null +++ b/website/docs/pype2/admin_presets_maya.md @@ -0,0 +1,143 @@ +--- +id: admin_presets_maya +title: Presets > Maya +sidebar_label: Maya +--- + +## CAPTURE.json + +path: `pype-config/presets/maya/capture.json` + +All the viewport settings for maya playblasts. + +### `Codec` [dict] ### + +```python + "Codec": { + "compression": "jpg", + "format": "image", + "quality": 95 + } +``` + + +### `Display Options` [dict] ### + +```python +"Display Options": { + "background": [ + 0.7137254901960784, + 0.7137254901960784, + 0.7137254901960784 + ], + "backgroundBottom": [ + 0.7137254901960784, + 0.7137254901960784, + 0.7137254901960784 + ], + "backgroundTop": [ + 0.7137254901960784, + 0.7137254901960784, + 0.7137254901960784 + ], + "override_display": true + } +``` + +### `Generic` [dict] ### +```python +"Generic": { + "isolate_view": true, + "off_screen": true +}, +``` + +### `IO` [dict] ### + +```python +"IO": { + "name": "", + "open_finished": false, + "raw_frame_numbers": false, + "recent_playblasts": [], + "save_file": false +}, +``` + +### `PanZoom` [dict] ### + +```python +"PanZoom": { + "pan_zoom": true +}, +``` + +### `Viewport Options` [dict] ### + +```python +"Viewport Options": { + "cameras": false, + "clipGhosts": false, + "controlVertices": false, + "deformers": false, + "dimensions": false, + "displayLights": 0, + "dynamicConstraints": false, + "dynamics": false, + "fluids": false, + "follicles": false, + "gpuCacheDisplayFilter": false, + "greasePencils": false, + "grid": false, + "hairSystems": false, + "handles": false, + "high_quality": true, + "hud": false, + "hulls": false, + "ikHandles": false, + "imagePlane": false, + "joints": false, + "lights": false, + "locators": false, + "manipulators": false, + "motionTrails": false, + "nCloths": false, + "nParticles": false, + "nRigids": false, + "nurbsCurves": false, + "nurbsSurfaces": false, + "override_viewport_options": true, + "particleInstancers": false, + "pivots": false, + "planes": false, + "pluginShapes": false, + "polymeshes": true, + "shadows": false, + "strokes": false, + "subdivSurfaces": false, + "textures": false, + "twoSidedLighting": true +} +``` + +## Maya instance scene types + +It is possible to set when to use `.ma` or `.mb` for: + +- camera +- setdress +- layout +- model +- rig +- yetiRig + +Just put `ext_mapping.json` into `presets/maya`. Inside is simple mapping: + +```JSON +{ + "rig": "mb", + "camera": "mb" +} +``` + +*Note that default type is `ma`* diff --git a/website/docs/pype2/admin_presets_nukestudio.md b/website/docs/pype2/admin_presets_nukestudio.md new file mode 100644 index 0000000000..256c6e5ef4 --- /dev/null +++ b/website/docs/pype2/admin_presets_nukestudio.md @@ -0,0 +1,58 @@ +--- +id: admin_presets_nukestudio +title: Presets > NukeStudio +sidebar_label: Nukestudio +--- + +## TAGS.json + +path: `pype-config/presets/nukestudio/tags.json` + +Each tag defines defaults in `.json` file. Inside of the file you can change the default values as shown in the example (`>>>"1001"<<<`). Please be careful not to alter the `family` value. + +```python +"Frame start": { + "editable": "1", + "note": "Starting frame for comps", + "icon": { + "path": "icons:TagBackground.png" + }, + "metadata": { + "family": "frameStart", + "number": >>>"1001"<<< + } +} +``` + +## PUBLISH.json + +path: `pype-config/presets/plugins/nukestudio/publish.json` + +### `CollectInstanceVersion` [dict] ### + + +This plugin is set to `true` by default so it will synchronize version of published instances with the version of the workfile. Set `enabled` to `false` if you wish to let publishing process decide on the next available version. + +```python +{ + "CollectInstanceVersion": { + "enabled": false + } +} +``` + +### `ExtractReviewCutUpVideo` [dict] ### + +path: `pype-config/presets/plugins/nukestudio/publish.json` + +Plugin is responsible for cuting shorter or longer source material for review. Here you can add any aditional tags you wish to be added into extract review process. + +The plugin generates reedited intermediate video with handless even if it has to add empty black frames. Some productions prefer to use review material without handless so in the example, `no-handles` are added as tags. This allow furter review extractor to publish review without handles, without affecting other outputs. + +```python +{ + "ExtractReviewCutUpVideo": { + "tags_addition": ["no-handles"] + } +} +``` diff --git a/website/docs/pype2/admin_presets_plugins.md b/website/docs/pype2/admin_presets_plugins.md new file mode 100644 index 0000000000..797995d2b7 --- /dev/null +++ b/website/docs/pype2/admin_presets_plugins.md @@ -0,0 +1,592 @@ +--- +id: admin_presets_plugins +title: Presets > Plugins +sidebar_label: Plugins +--- + +## Global + +### publish.json + +Each plugin in the json should be added as name of the class. There are some default attributes recommended to use in case you wish a plugin to be switched off for some projects in `project overwrites` like `enabled: false`. So for example if you wish to switch off plugin class name `PluginName(pyblish.api.contextPlugin)` if file `name_of_plugin_file.py`, it could be done only by adding following text into root level of publish.json file: + +```json +{ + "PluginName": { + "enabled": false + } +} +``` + + +### `ExtractReview` + +Plugin responsible for automatic FFmpeg conversion to variety of formats. + +Supported extensions for both input and output: `["exr", "jpg", "jpeg", "png", "dpx", "mov", "mp4"]` + +**ExtractReview** creates new representations based on presets and representations in instance. Preset should contain only one attribute **"profiles"** which is list of profile items. Each profile item has **outputs**, where definitions of possible outputs are, and may have specified filters for **hosts**, **tasks** and **families**. + +#### Profile filters +As mentioned above you can define multiple profiles for different contexts. Profile with filters matching current context the most is used. You can define profile without filters and use it as **default**. Only **one or none** profile is processed per instance. + +All context filters are lists which may contain strings or Regular expressions (RegEx). +- **hosts** - Host from which publishing was triggered. `["maya", "nuke"]` +- **tasks** - Currently processed task. `["[Cc]ompositing", "[Aa]nimation"]` +- **families** - Main family of processed instance. `["plate", "model"]` + +:::important Filtering +Filters are optional and may not be set. In case when multiple profiles match current context, profile with filters has higher priority that profile without filters. +::: + +#### Profile outputs +Profile may have multiple outputs from one input and that's why **outputs** is dictionary where key represents **filename suffix** to avoid overriding files with same name and value represents definition itself. Definition may contain multiple optional keys. + +| Key | Description | Type | Example | +| --- | --- | --- | --- | +| **width** | Width of output. | int | 1920 | +| **height** | Height of output. | int | 1080 | +| **letter_box** | Set letterbox ratio. | float | 2.35 | +| **ext** | Extension of output file(s). | str | "mov" | +| **tags** | Tags added to new representation. | list | [here](#new-representation-tags-tags) | +| **ffmpeg_args** | Additional FFmpeg arguments. | dict | [here](#ffmpeg-arguments-ffmpeg_args) | +| **filter** | Filters definition. | dict | [here](#output-filters-filter) | + +:::note +As metioned above **all keys are optional**. If they are not filled at all, then **"ext"** is filled with input's file extension and resolution keys **"width"** and **"heigh"** are filled from instance data, or from input resolution if instance doesn't have set them. +::: + +:::important resolution +It is not possible to enter only **"width"** or only **"height"**. In that case set values will be skipped. +::: + +#### New representation tags (`tags`) +You can add tags to representation created during extracting process. This might help to define what should happen with representation in upcomming plugins. + +| Tag | Description | +| --- | --- | +| **burnin** | Add burnins with predefined values into the output. | +| **preview** | Will be used as preview in Ftrack. | +| **reformat** | Rescale to format based on width and height keys. | +| **bake-lut** | Bake LUT into the output (if is available path in data). | +| **slate-frame** | Add slate frame at the beggining of video. | +| **no-handles** | Remove the shot handles from the output. | +| **sequence** | Generate a sequence of images instead of single frame.
Is applied only if **"ext"** of output is image extension e.g.: png or jpg/jpeg. | + +:::important Example +Tags key must contain list of strings. +```json +{ + "tags": ["burnin", "preview"] + ... +} +``` +::: + +#### FFmpeg arguments (`ffmpeg_args`) +It is possible to set additional FFmpeg arguments. Arguments are split into 4 categories **"input"**, **"video_filters"**, **"audio_filters"** and **"output"**. + +| Key | Description | Type | Example | +| --- | --- | --- | --- | +| **input** | FFmpeg arguments added before video/image input. | list | ["-gamma 2.2"] | +| **video_filters** | All values which should be in `-vf` or `-filter:v` argument. | list | ["scale=iw/2:-1"] | +| **audio_filters** | All values which should be in `-af` or `-filter:a` argument. | list | ["loudnorm"] | +| **output** | FFmpeg arguments added before output filepath. | list | ["-pix_fmt yuv420p", "-crf 18"] | + +:::important Example +For more information about FFmpeg arguments please visit [official documentation](https://ffmpeg.org/documentation.html). +```json +{ + "ffmpeg_args": { + "input": ["-gamma 2.2"], + "video_filters": ["yadif=0:0:0", "scale=iw/2:-1"], + "output": ["-pix_fmt yuv420p", "-crf 18"] + } + ... +} +``` +::: + +#### Output filters (`filter`) +Even if profile has filtering options it is possible that output definitions require to be filtered by all instance **families** or representation's **tags**. + +Families filters in output's `filter` will check all instance's families and may check for single family or combination of families. + +| Key | Description | Type | Example | +| --- | --- | --- | --- | +| **families** | At least one family item must match instance's families to process definition. | list | ["review"] | +| **tags** | At least one tag from list must be in representation's tags to process definition. | list | ["preview"] | + +:::important Example +These filters helps with explicit processing but do **NOT** use them if it's not necessary. +```json +{ + "filter": { + "families": [ + "review", + ["ftrack", "render2d"] + ], + "tags": ["preview"], + } + ... +} +``` +In this example representation's tags must contain **"preview"** tag and instance's families must contain **"review"** family, or both **"ftrack"** and **"render2d"** families. +::: + +#### Simple example +This example just create **mov** output with filename suffix **"simplemov"** for all representations with supported extensions. +```json +{ + "ExtractReview": { + "profiles": [{ + "outputs": { + /* Filename suffix "simplemov"*/ + "simplemov": { + /* Output extension will be "mov"*/ + "ext": "mov" + } + } + }] + } +} +``` + +#### More complex example +:::note +This is just usage example, without relevant data. Do **NOT** use these presets as default in production. +::: + +```json +{ + "ExtractReview": { + "profiles": [ + { + /* 1. profile - Without filters will be used as default. */ + "outputs": { + /* Extract single mov Prores 422 with burnins, slate and baked lut. */ + "prores": { + "ext": "mov", + "codec": [ + "-codec:v prores_ks", + "-profile:v 3" + ], + "tags": ["burnin", "reformat", "bake-lut", "slate-frame"] + } + } + }, { + /* 2. profile - Only for Nuke, "compositing" task and instance family "render2d". */ + "hosts": ["nuke"], + "tasks": ["compositing"], + "families": ["render2d"], + "outputs": { + /* Extract preview mov with burnins and without handles.*/ + "h264": { + "ext": "mov", + "ffmpeg_args": { + "output": [ + "-pix_fmt yuv420p", + ] + }, + "tags": ["burnin", "preview", "no-handles"] + }, + /* Also extract mxf with slate */ + "edit": { + "ext": "mxf", + "ffmpeg_args": { + "output": [ + "-codec:v dnxhd", + "-profile:v dnxhr_444", + "-pix_fmt yuv444p10le", + "-b:v 185M", + "-ar 48000", + "-qmax 51" + ] + }, + "tags": ["slate-frame"] + } + } + }, { + /* 3. profile - Default profile for Nuke and Maya. */ + "hosts": ["maya", "nuke"], + "outputs": { + /* Extract preview mov with burnins and with forced resolution. */ + "h264": { + "width": 1920, + "height": 1080, + "ext": "mov", + "ffmpeg_args": { + "input": [ + "-gamma 2.2" + ], + "output": [ + "-pix_fmt yuv420p", + "-crf 18", + "-intra" + ] + }, + "tags": ["burnin", "preview"] + } + } + } + ] + } +} +``` + + +### `ExtractBurnin` + +Plugin is responsible for adding burnins into review representations. + +Burnins are text values painted on top of input and may be surrounded with box in 6 available positions `Top Left`, `Top Center`, `Top Right`, `Bottom Left`, `Bottom Center`, `Bottom Right`. + +![presets_plugins_extract_burnin](../assets/presets_plugins_extract_burnin_01.png) + +ExtractBurnin creates new representations based on plugin presets and representations in instance. Presets may contain 3 keys **options**, **profiles** and **fields**. + +#### Burnin settings (`options`) +Options is dictionary where you can set the global appearance of burnins. It is possible to not fill options at all, in that case default values are used. + +| Key | Description | Type | Example | Default | +| --- | --- | --- | --- | --- | +| **font_size** | Size of text. | float | 24 | 42 | +| **font_color** | Color of text. | str | [FFmpeg color documentation](https://ffmpeg.org/ffmpeg-utils.html#color-syntax) | "white" | +| **opacity** | Opacity of text. | float | 0.7 | 1 | +| **x_offset** | Horizontal margin around text and box. | int | 0 | 5 | +| **y_offset** | Vertical margin around text and box. | int | 0 | 5 | +| **bg_padding** | Padding for box around text. | int | 0 | 5 | +| **bg_color** | Color of box around text. | str | [FFmpeg color documentation](https://ffmpeg.org/ffmpeg-utils.html#color-syntax) | "black" | +| **bg_opacity** | Opacity of box around text. | float | 1 | 0.5 | + +#### Burnin profiles (`profiles`) +Plugin process is skipped if `profiles` are not set at all. Profiles contain list of profile items. Each profile item has **burnins**, where definitions of possible burnins are, and may have specified filters for **hosts**, **tasks** and **families**. Filters work the same way as described in [ExtractReview](#profile-filters). + +#### Profile burnins +Profile may have set multiple burnin outputs from one input and that's why **burnins** is dictionary where key represents **filename suffix** to avoid overriding files with same name and value represents burnin definition. Burnin definition may contain multiple optional keys. + +| Key | Description | Type | Example | +| --- | --- | --- | --- | +| **top_left** | Top left corner content. | str | "{dd}.{mm}.{yyyy}" | +| **top_centered** | Top center content. | str | "v{version:0>3}" | +| **top_right** | Top right corner content. | str | "Static text" | +| **bottom_left** | Bottom left corner content. | str | "{asset}" | +| **bottom_centered** | Bottom center content. | str | "{username}" | +| **bottom_right** | Bottom right corner content. | str | "{frame_start}-{current_frame}-{frame_end}" | +| **options** | Options overrides for this burnin definition. | dict | [Options](#burnin-settings-options) | +| **filter** | Filters definition. | dict | [ExtractReview output filter](#output-filters-filter) | + +:::important Position keys +Any position key `top_left` -> `bottom_right` is skipped if is not set, contain empty string or is set to `null`. +And position keys are not case sensitive so instead of key `top_left` can be used `TOP_LEFT` or `Top_Left` +::: + +:::note Filename suffix +Filename suffix is appended to filename suffix of source representation. +If source representation has suffix **"h264"** and burnin suffix is **"client"** then final suffix is **"h264_client"**. +::: + +**Available keys in burnin content** + +- It is possible to use same keys as in [Anatomy](admin_config#available-keys). + +- It is allowed to use [Anatomy templates](admin_config#anatomy) themselves in burnins if they can be filled with available data. + +- Additional keys in burnins: + | Burnin key | Description | + | --- | --- | + | frame_start | First frame number. | + | frame_end | Last frame number. | + | current_frame | Frame number for each frame. | + | duration | Count number of frames. | + | resolution_width | Resolution width. | + | resolution_height | Resolution height. | + | fps | Fps of an output. | + | timecode | Timecode by frame start and fps. | + +:::warning +`timecode` is specific key that can be **only at the end of content**. (`"BOTTOM_RIGHT": "TC: {timecode}"`) +::: + +```json +{ + "profiles": [{ + "burnins": { + "example": { + "TOP_LEFT": "{dd}.{mm}.{yyyy}", + /* Use anatomy template values. */ + "TOP_CENTERED": "{anatomy[publish][path]}", + /* Python's formatting: + ":0>3" adds padding to version number to have 3 digits. */ + "TOP_RIGHT": "v{version:0>3}", + "BOTTOM_LEFT": "{frame_start}-{current_frame}-{frame_end}", + "BOTTOM_CENTERED": "{asset}", + "BOTTOM_RIGHT": "{username}" + } + } + }] + ... +} +``` + + +#### Default content values (`fields`) +If you want to set position content values for all or most of burnin definitions, you can set them in **"fields"**. They will be added to every burnin definition in all profiles. Value can be overriden if same position key is filled in burnin definiton. + +```json +{ + "fields": { + "TOP_LEFT": "{yy}-{mm}-{dd}", + "TOP_CENTERED": "{username}", + "TOP_RIGHT": "v{version:0>3}" + }, + "profiles": [{ + "burnins": { + /* example1 has empty definition but top left, center and right values + will be filled. */ + "example1": {}, + + /* example2 has 2 overrides. */ + "example2": { + /* Top left value is overriden with asset name. */ + "TOP_LEFT": "{asset}", + /* Top center will be skipped. */ + "TOP_CENTERED": null + } + } + }] +} +``` + +#### Full presets example +:::note +This is just usage example, without relevant data. Do **NOT** use these presets as default in production. +::: + +```json +{ + "ExtractBurnin": { + "options": { + "opacity": 1, + "x_offset": 5, + "y_offset": 5, + "bg_padding": 5, + "bg_opacity": 0.5, + "font_size": 42 + }, + "fields": { + "TOP_LEFT": "{yy}-{mm}-{dd}", + "TOP_RIGHT": "v{version:0>3}" + }, + "profiles": [{ + "burnins": { + "burnin": { + "options": { + "opacity": 1 + }, + "TOP_LEFT": "{username}" + } + } + }, { + "families": ["animation", "pointcache", "model"], + "tasks": ["animation"], + "burnins": {} + }, { + "families": ["render"], + "tasks": ["compositing"], + "burnins": { + "burnin": { + "TOP_LEFT": "{yy}-{mm}-{dd}", + "TOP_RIGHT": "v{version:0>3}", + "BOTTOM_RIGHT": "{frame_start}-{current_frame}-{frame_end}", + "BOTTOM_LEFT": "{username}" + }, + "burnin_ftrack": { + "filter": { + "families": ["ftrack"] + }, + "BOTTOM_RIGHT": "{frame_start}-{current_frame}-{frame_end}", + "BOTTOM_LEFT": "{username}" + }, + "burnin_v2": { + "options": { + "opacity": 0.5 + }, + "TOP_LEFT": "{yy}-{mm}-{dd}", + "TOP_RIGHT": "v{version:0>3}" + } + } + }, { + "families": ["rendersetup"], + "burnins": { + "burnin": { + "TOP_LEFT": "{yy}-{mm}-{dd}", + "BOTTOM_LEFT": "{username}" + } + } + }, { + "tasks": ["animation"], + "burnins": { + "burnin": { + "TOP_RIGHT": "v{version:0>3}", + "BOTTOM_RIGHT": "{frame_start}-{current_frame}-{frame_end}" + } + } + }] + } +} +``` + +### `ProcessSubmittedJobOnFarm` + +```json +{ + "ProcessSubmittedJobOnFarm": { + "aov_filter": { + "host": ["aov_name"], + "maya": ["beauty"] + }, + "deadline_pool": "" + } +} +``` + +## Maya + +### load.json + +### `colors` + +maya outliner colours for various families + +```python +"colors": { + "model": [0.821, 0.518, 0.117], + "rig": [0.144, 0.443, 0.463], + "pointcache": [0.368, 0.821, 0.117], + "animation": [0.368, 0.821, 0.117], + "ass": [1.0, 0.332, 0.312], + "camera": [0.447, 0.312, 1.0], + "fbx": [1.0, 0.931, 0.312], + "mayaAscii": [0.312, 1.0, 0.747], + "setdress": [0.312, 1.0, 0.747], + "layout": [0.312, 1.0, 0.747], + "vdbcache": [0.312, 1.0, 0.428], + "vrayproxy": [0.258, 0.95, 0.541], + "yeticache": [0.2, 0.8, 0.3], + "yetiRig": [0, 0.8, 0.5] +} +``` + +### publish.json + +### `ValidateModelName` + +```python +"ValidateModelName": { + "enabled": false, + "material_file": "/path/to/shader_name_definition.txt", + "regex": "(.*)_(\\d)*_(?P.*)_(GEO)" +}, +``` + +### `ValidateShaderName` + +```python +"ValidateShaderName": { + "enabled": false, + "regex": "(?P.*)_(.*)_SHD" +} +``` + +## Nuke + +### create.json + +### `CreateWriteRender` + +```python +"CreateWriteRender": { + "fpath_template": "{work}/renders/nuke/{subset}/{subset}.{frame}.{ext}" +} +``` + +### publish.json + +### `ExtractThumbnail` + +Plugin responsible for generating thumbnails with colorspace controlled by Nuke. Reformat node will secure proper framing within the default workfile screen space. + +```json +{ +"nodes": { + "Reformat": [ + ["type", "to format"], + ["format", "HD_1080"], + ["filter", "Lanczos6"], + ["black_outside", true], + ["pbb", false] + ] +} +} +``` + +### `ExtractReviewDataMov` + +`viewer_lut_raw` **true** will publish the baked mov file without any colorspace conversion. It will be baked with the workfile workspace. This can happen in case the Viewer input process uses baked screen space luts. + +#### baking with controlled colorspace + +Some productions might be using custom OCIO config files either for whole project, sequence or even individual shots. In that case we can use **display roles** to let compositors use their preferred viewer space, but also make sure baking of outputs is happening in a defined space for clients reviews. + + +`bake_colorspace_fallback` this will be used if for some reason no space defined in `shot_grade_rec709` is found on shot's _config.ocio_ + +> be aware this will only work if `viewer_lut_raw` is on _false_ + +```json +{ +"viewer_lut_raw": false, +"bake_colorspace_fallback": "show_lut_rec709", +"bake_colorspace_main": "shot_grade_rec709" +} +``` + +## NukeStudio + +### Publish.json + +Destination of the following example codes: + +[`presets/plugins/nukestudio/publish.json`](https://github.com/pypeclub/pype-config/blob/develop/presets/plugins/nukestudio/publish.json) + +### `CollectInstanceVersion` + +Activate this plugin if you want your published plates to always have the same version as the hiero project they were published from. If this plugin is off, plate versioning automatically finds the next available version in the database. + +```json +{ + "CollectInstanceVersion": { + "enabled": true + } +} +``` + +### `ExtractReviewCutUpVideo` + +Example of tag which could be added into the plugin preset. +In this case because we might have 4K plates but we would like to publish all review files reformated to 2K. + +[details of available tags](#preset-attributes) + +```json +{ + "ExtractReviewCutUpVideo": { + "tags_addition": ["reformat"] + } +} +``` + +## Standalone Publisher + +Documentation yet to come. diff --git a/website/docs/pype2/admin_presets_tools.md b/website/docs/pype2/admin_presets_tools.md new file mode 100644 index 0000000000..bcd992a1eb --- /dev/null +++ b/website/docs/pype2/admin_presets_tools.md @@ -0,0 +1,191 @@ +--- +id: admin_presets_tools +title: Presets > Tools +sidebar_label: Tools +--- + +## Colorspace + +We provide two examples of possible settings for nuke, but these can vary wildly between clients and projects. + +### `Default` [dict] + +path: `pype-config/presets/colorspace/default.json` + +```python +"nuke": { + "root": { + "colorManagement": "Nuke", + "OCIO_config": "nuke-default", + "defaultViewerLUT": "Nuke Root LUTs", + "monitorLut": "sRGB", + "int8Lut": "sRGB", + "int16Lut": "sRGB", + "logLut": "Cineon", + "floatLut": "linear" + }, + "viewer": { + "viewerProcess": "sRGB" + }, + "write": { + "render": { + "colorspace": "linear" + }, + "prerender": { + "colorspace": "linear" + }, + "still": { + "colorspace": "sRGB" + } + } +}, +``` + +### `aces103-cg` [dict] + + +path: `pype-config/presets/colorspace/aces103-cg.json` + +```python +"nuke": { + "root": { + "colorManagement": "OCIO", + "OCIO_config": "aces_1.0.3", + "workingSpaceLUT": "ACES - ACEScg", + "defaultViewerLUT": "OCIO LUTs", + "monitorLut": "ACES/sRGB D60 sim.", + "int8Lut": "Utility - sRGB - Texture", + "int16Lut": "Utility - sRGB - Texture", + "logLut": "Input - ARRI - V3 LogC (EI800) - Wide Gamut", + "floatLut": "ACES - ACES2065-1" + }, + "viewer": { + "viewerProcess": "sRGB D60 sim. (ACES)" + }, + "write": { + "render": { + "colorspace": "ACES - ACEScg" + }, + "prerender": { + "colorspace": "ACES - ACEScg" + }, + "still": { + "colorspace": "Utility - Curve - sRGB" + } + } +}, +``` + + +## Creator Defaults + +path: `pype-config/presets/tools/creator.json` + +This preset tells the creator tools what family should be pre-selected in different tasks. Keep in mind that the task is matched loosely so for example any task with 'model' in it's name will be considered a modelling task for these purposes. + +`"Family name": ["list, "of, "tasks"]` + +```python +"Model": ["model"], +"Render Globals": ["light", "render"], +"Layout": ["layout"], +"Set Dress": ["setdress"], +"Look": ["look"], +"Rig": ["rigging"] +``` + +## Project Folder Structure + +path: `pype-config/presets/tools/project_folder_structure.json` + +Defines the base folder structure for a project. This is supposed to act as a starting point to quickly creat the base of the project. You can add `[ftrack.entityType]` after any of the folders here and they will automatically be also created in ftrack project. + +### `__project_root__` [dict] + +```python +"__project_root__": { + "_prod" : {}, + "_resources" : { + "footage": { + "ingest": {}, + "offline": {} + }, + "audio": {}, + "art_dept": {}, + }, + "editorial" : {}, + "assets[ftrack.Library]": { + "characters[ftrack]": {}, + "locations[ftrack]": {} + }, + "shots[ftrack.Sequence]": { + "editorial[ftrack.Folder]": {} + } +} +``` + +## Software Folders + +path: `pype-config/presets/tools/sw_folders.json` + +Defines extra folders to be created inside the work space when particular task type is launched. Mostly used for configs, that use {app} key in their work template and want to add hosts that are not supported yet. + +```python +"compositing": ["nuke", "ae"], +"modeling": ["maya", "app2"], +"lookdev": ["substance"], +"animation": [], +"lighting": [], +"rigging": [] +``` + +## Tray Items + +path: `pype-config/presets/tray/menu_items.json` + +This preset let's admins to turn different pype modules on and off from the tray menu, which in turn makes them unavailable across the pipeline + +### `item_usage` [dict] + +```python +"item_usage": { + "User settings": false, + "Ftrack": true, + "Muster": false, + "Avalon": true, + "Clockify": false, + "Standalone Publish": true, + "Logging": true, + "Idle Manager": true, + "Timers Manager": true, + "Rest Api": true +}, +``` + +## Muster Templates + +path: `pype-config/presets/muster/templates_mapping.json` + +Muster template mapping maps Muster template ID to name of renderer. Initially it is set Muster defaults. About templates and Muster se Muster Documentation. Mapping is defined in: + +Keys are renderer names and values are templates IDs. + +```python +"3delight": 41, +"arnold": 46, +"arnold_sf": 57, +"gelato": 30, +"harware": 3, +"krakatoa": 51, +"file_layers": 7, +"mentalray": 2, +"mentalray_sf": 6, +"redshift": 55, +"renderman": 29, +"software": 1, +"software_sf": 5, +"turtle": 10, +"vector": 4, +"vray": 37, +"ffmpeg": 48 +``` diff --git a/website/docs/pype2/admin_pype_commands.md b/website/docs/pype2/admin_pype_commands.md new file mode 100644 index 0000000000..245e8a23e2 --- /dev/null +++ b/website/docs/pype2/admin_pype_commands.md @@ -0,0 +1,287 @@ +--- +id: admin_pype_commands +title: Pype Commands Reference +sidebar_label: Pype Commands +--- + + + +## Help + +To get all available commands: +```sh +pype --help +``` + +To get help on particular command: +```sh +pype --help +``` + +-------------------- +## `clean` + +Command to clean Python bytecode files from Pype and it's environment. Useful +for developers after code or environment update. + +-------------------- + +## `coverage` + +### `--pype` +- without this option, tests are run on *pype-setup* only. + +Generate code coverage report. +```sh +pype coverage --pype +``` + +-------------------- + +## `deploy` + +To deploy Pype: +```sh +pype deploy +``` + +### `--force` + +To force re-deploy: +```sh +pype deploy --force +``` + +--------------------------- + +## `download` + +To download required dependencies: +```sh +pype download +``` + +-------------------- + +## `eventserver` + +This command launches ftrack event server. + +This should be ideally used by system service (such us systemd or upstart +on linux and window service). + +You have to set either proper environment variables to provide URL and +credentials or use option to specify them. If you use `--store_credentials` +provided credentials will be stored for later use. + +To run ftrack event server: +```sh +pype eventserver --ftrack-url= --ftrack-user= --ftrack-api-key= --ftrack-events-path= --no-stored-credentials --store-credentials +``` + +### `--debug` +- print debug info + +### `--ftrack-url` +- URL to ftrack server + +### `--ftrack-user` +- user name to log in to ftrack + +### `--ftrack-api-key` +- ftrack api key + +### `--ftrack-events-path` +- path to event server plugins + +### `--no-stored-credentials` +- will use credential specified with options above + +### `--store-credentials` +- will store credentials to file for later use + +-------------------- + +## `install` + +To install Pype: + +```sh +pype install +``` + +### `--force` + +To reinstall Pype: +```sh +pype install --force +``` + +### `--offline` + +To install Pype in offline mode: +```sh +pype install --offline +``` + +To reinstall Pype in offline mode: +```sh +pype install --offline --force +``` + +-------------------- + +## `launch` + +Launch application in Pype environment. + +### `--app` + +Application name - this should be the same as it's [defining toml](admin_hosts#launchers) file (without .toml) + +### `--project` +Project name + +### `--asset` +Asset name + +### `--task` +Task name + +### `--tools` +*Optional: Additional tools environment files to add* + +### `--user` +*Optional: User on behalf to run* + +### `--ftrack-server` / `-fs` +*Optional: Ftrack server URL* + +### `--ftrack-user` / `-fu` +*Optional: Ftrack user* + +### `--ftrack-key` / `-fk` +*Optional: Ftrack API key* + +For example to run Python interactive console in Pype context: +```sh +pype launch --app python --project my_project --asset my_asset --task my_task +``` + +-------------------- + +## `make_docs` + +Generate API documentation into `docs/build` +```sh +pype make_docs +``` + +-------------------- + +## `mongodb` + +To run testing mongodb database (requires mongoDB installed on the workstation): +```sh +pype mongodb +``` + +-------------------- + +## `publish` + +Pype takes JSON from provided path and use it to publish data in it. +```sh +pype publish +``` + +### `--gui` +- run Pyblish GUI + +### `--debug` +- print more verbose infomation + +-------------------- + +## `test` + +### `--pype` +- without this option, tests are run on *pype-setup* only. + +Run test suite on Pype: +```sh +pype test --pype +``` +:::note Pytest +For more information about testing see [Pytest documentation](https://docs.pytest.org/en/latest/) +::: + +-------------------- + +## `texturecopy` + +Copy specified textures to provided asset path. + +It validates if project and asset exists. Then it will +copy all textures found in all directories under `--path` to destination +folder, determined by template texture in **anatomy**. I will use source +filename and automatically rise version number on directory. + +Result will be copied without directory structure so it will be flat then. +Nothing is written to database. + +### `--project` + +### `--asset` + +### `--path` + +```sh +pype texturecopy --project --asset --path +``` + +-------------------- + +## `tray` + +To launch Tray: +```sh +pype tray +``` + +### `--debug` + +To launch Tray with debugging information: +```sh +pype tray --debug +``` + +-------------------- + +## `update-requirements` + +Synchronize dependecies in your virtual environment with requirement.txt file. +Equivalent of running `pip freeze > pypeapp/requirements.txt` from your virtual +environmnet. This is useful for development purposes. + +```sh +pype update-requirements +``` + +-------------------- + +## `validate` + +To validate deployment: +```sh +pype validate +``` + +-------------------- + +## `validate-config` + +To validate JSON configuration files for syntax errors: +```sh +pype validate-config +``` diff --git a/website/docs/pype2/admin_setup_troubleshooting.md b/website/docs/pype2/admin_setup_troubleshooting.md new file mode 100644 index 0000000000..2ffdd9b5f3 --- /dev/null +++ b/website/docs/pype2/admin_setup_troubleshooting.md @@ -0,0 +1,17 @@ +--- +id: admin_setup_troubleshooting +title: Setup Troubleshooting +sidebar_label: Setup Troubleshooting +--- + +## SSL Server certificates + +Python is strict about certificates when connecting to server with SSL. If +certificate cannot be validated, connection will fail. Therefor care must be +taken when using self-signed certificates to add their certification authority +to trusted certificates. + +Also please note that even when using certificates from trusted CA, you need to +update your trusted CA certificates bundle as those certificates can change. + +So if you receieve SSL error `cannot validate certificate` or similar, please update root CA certificate bundle on machines and possibly **certifi** python package in Pype virtual environment - just edit `pypeapp/requirements.txt` and update its version. You can find current versions on [PyPI](https://pypi.org). diff --git a/website/docs/system_introduction.md b/website/docs/system_introduction.md new file mode 100644 index 0000000000..71c5d64aa8 --- /dev/null +++ b/website/docs/system_introduction.md @@ -0,0 +1,71 @@ +--- +id: system_introduction +title: Introduction +sidebar_label: Introduction +--- + + +**OpenPype** is a python application built on top of many other open-source libraries, modules and projects. +To be able to use it, you need those tools and set your environment. This +requires additional software installed and set up correctly on your system. + +Fortunately this daunting task is mostly handled for you by OpenPype build and install scripts. **OpenPype** can +install most of its requirements automatically but a few more things are needed in +various usage scenarios. + +## Studio Preparation + +You can find detailed breakdown of technical requirements [here](dev_requirements), but in general OpenPype should be able +to operate in most studios fairly quickly. The main obstacles are usually related to workflows and habits, that +might now be fully compatible with what OpenPype is expecting or enforcing. + +Keep in mind that if you run into any workflows that are not supported, it's usually just because we haven't hit +that particular case and it can most likely be added upon request. + + +## Artist Workstations + +To use **OpenPype** in production, it should be installed on each artist workstation, whether that is in the studio or at home in +case of a distributed workflow. Once started, it lives in the system tray menu bar and all of it's tools are executed locally on +the artist computer. There are no special requirements for the artist workstations if you are running openPype from a frozen build. + +Each artist computer will need to be able to connect to your central mongo database to load and publish any work. They will also need +access to your centralized project storage, unless you are running a fully distributed pipeline. + +## Centralized and Distributed? + +OpenPype supports a variety of studio setups, for example: + +- Single physical location with monolithic project storage. +- Fully remote studios, utilizing artist's home workstations. +- Distributed studios, running fully or partially on the cloud. +- Hybrid setups with different storages per project. +- And others that we probably didn't think of at all. + +It is totally up to you how you deploy and distribute OpenPype to your artist, but there are a few things to keep in mind: +- While it is possible to store project files in different locations for different artist, it bring a lot of extra complexity +to the table +- Some DCCs do not support using Environment variables in file paths. This will make it very hard to maintain full multiplatform +compatibility as well variable storage roots. +- Relying on VPN connection and using it to work directly of network storage will be painfully slow. + + +## Repositories + +### [OpenPype](https://github.com/pypeclub/pype) + +This is where vast majority of the code that works with your data lives. It acts +as Avalon-Config, if we're speaking in avalon terms. + +Avalon gives us the ability to work with a certain host, say Maya, in a standardized manner, but OpenPype defines **how** we work with all the data, allows most of the behavior to be configured on a very granular level and provides a comprehensive build and installation tools for it. + +Thanks to that, we are able to maintain one codebase for vast majority of the features across all our clients deployments while keeping the option to tailor the pipeline to each individual studio. + +### [Avalon-core](https://github.com/pypeclub/avalon-core) + +Avalon-core is the heart of OpenPype. It provides the base functionality including key GUIs (albeit expanded and modified by us), database connection, standards for data structures, working with entities and some universal tools. + +Avalon is being actively developed and maintained by a community of studios and TDs from around the world, with Pype Club team being an active contributor as well. + +Due to the extensive work we've done on OpenPype and the need to react quickly to production needs, we +maintain our own fork of avalon-core, which is kept up to date with upstream changes as much as possible. diff --git a/website/docs/upgrade_notes.md b/website/docs/upgrade_notes.md new file mode 100644 index 0000000000..dbc90e948d --- /dev/null +++ b/website/docs/upgrade_notes.md @@ -0,0 +1,165 @@ +--- +id: update_notes +title: Update Notes +sidebar_label: Update Notes +--- + + + +## **Updating to 2.13.0** ## + +### MongoDB + +**Must** + +Due to changes in how tasks are stored in the database (we added task types and possibility of more arbitrary data.), we must take a few precautions when updating. +1. Make sure that ftrack event server with sync to avalon is NOT running during the update. +2. Any project that is to be worked on with 2.13 must be synced from ftrack to avalon with the udpated sync to avalon action, or using and updated event server sync to avalon event. + +If 2.12 event servers runs when trying to update the project sync with 2.13, it will override any changes. + +### Nuke Studio / hiero + +Make sure to re-generate pype tags and replace any `task` tags on your shots with the new ones. This will allow you to make multiple tasks of the same type, but with different task name at the same time. + +### Nuke + +Due to a minor update to nuke write node, artists will be prompted to update their write nodes before being able to publish any old shots. There is a "repair" action for this in the publisher, so it doesn't have to be done manually. + + + + +## **Updating to 2.12.0** ## + +### Apps and tools + +**Must** + +run Create/Update Custom attributes action (to update custom attributes group) +check if studio has set custom intent values and move values to ~/config/presets/global/intent.json + +**Optional** + +Set true/false on application and tools by studio usage (eliminate app list in Ftrack and time for registering Ftrack ations) + + + + +## **Updating to 2.11.0** ## + +### Maya in deadline + +We added or own maya deadline plugin to make render management easier. It operates the same as standard mayaBatch in deadline, but allow us to separate Pype sumitted jobs from standard submitter. You'll need to follow this guide to update this [install pype deadline](https://pype.club/docs/admin_hosts#pype-dealine-supplement-code) + + + + +## **Updating to 2.9.0** ## + +### Review and Burnin PRESETS + +This release introduces a major update to working with review and burnin presets. They can now be much more granular and can target extremely specific usecases. The change is backwards compatible with previous format of review and burnin presets, however we highly recommend updating all the presets to the new format. Documentation on what this looks like can be found on pype main [documentation page](https://pype.club/docs/admin_presets_plugins#publishjson). + +### Multiroot and storages + +With the support of multiroot projects, we removed the old `storage.json` from configuration and replaced it with simpler `config/anatomy/roots.json`. This is a required change, but only needs to be done once per studio during the update to 2.9.0. [Read More](https://pype.club/docs/next/admin_config#roots) + + + + +## **Updating to 2.7.0** ## + +### Master Versions +To activate `master` version workflow you need to activate `integrateMasterVersion` plugin in the `config/presets/plugins/global/publish.json` + +``` +"IntegrateMasterVersion": {"enabled": true}, +``` + +### Ftrack + +Make sure that `intent` attributes in ftrack is set correctly. It should follow this setup unless you have your custom values +``` +{ + "label": "Intent", + "key": "intent", + "type": "enumerator", + "entity_type": "assetversion", + "group": "avalon", + "config": { + "multiselect": false, + "data": [ + {"test": "Test"}, + {"wip": "WIP"}, + {"final": "Final"} + ] + } +``` + + + + +## **Updating to 2.6.0** ## + +### Dev vs Prod + +If you want to differentiate between dev and prod deployments of pype, you need to add `config.ini` file to `pype-setup/pypeapp` folder with content. + +``` +[Default] +dev=true +``` + +### Ftrack + +You will have to log in to ftrack in pype after the update. You should be automatically prompted with the ftrack login window when you launch 2.6 release for the first time. + +Event server has to be restarted after the update to enable the ability to control it via action. + +### Presets + +There is a major change in the way how burnin presets are being stored. We simplified the preset format, however that means the currently running production configs need to be tweaked to match the new format. + +:::note Example of converting burnin preset from 2.5 to 2.6 + +2.5 burnin preset + +``` +"burnins":{ + "TOP_LEFT": { + "function": "text", + "text": "{dd}/{mm}/{yyyy}" + }, + "TOP_CENTERED": { + "function": "text", + "text": "" + }, + "TOP_RIGHT": { + "function": "text", + "text": "v{version:0>3}" + }, + "BOTTOM_LEFT": { + "function": "text", + "text": "{frame_start}-{current_frame}-{frame_end}" + }, + "BOTTOM_CENTERED": { + "function": "text", + "text": "{asset}" + }, + "BOTTOM_RIGHT": { + "function": "frame_numbers", + "text": "{username}" + } +``` + +2.6 burnin preset +``` +"burnins":{ + "TOP_LEFT": "{dd}/{mm}/{yyyy}", + "TOP_CENTER": "", + "TOP_RIGHT": "v{version:0>3}" + "BOTTOM_LEFT": "{frame_start}-{current_frame}-{frame_end}", + "BOTTOM_CENTERED": "{asset}", + "BOTTOM_RIGHT": "{username}" +} +``` diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js new file mode 100644 index 0000000000..3ce1cde060 --- /dev/null +++ b/website/docusaurus.config.js @@ -0,0 +1,128 @@ +module.exports = { + title: 'openPYPE', + tagline: 'Pipeline with support, for studios and remote teams.', + url: 'http://openpype.io/', + baseUrl: '/', + organizationName: 'Orbi Tools s.r.o', + projectName: 'openPype', + favicon: 'img/favicon/favicon.ico', + onBrokenLinks: 'ignore', + customFields: { + }, + presets: [ + [ + '@docusaurus/preset-classic', { + docs: { + sidebarPath: require.resolve('./sidebars.js'), + }, + theme: { + customCss: require.resolve('./src/css/custom.css') + } + } + ] + ], + themeConfig: { + colorMode: { + // "light" | "dark" + defaultMode: 'light', + + // Hides the switch in the navbar + // Useful if you want to support a single color mode + disableSwitch: true + }, + announcementBar: { + id: 'help_with_docs', // Any value that will identify this message. + content: + 'This documentation is work in progress, help us make it better.. Current working version is 3.0.0-beta.', + backgroundColor: '#fff', // Defaults to `#fff`. + textColor: '#000', // Defaults to `#000`. + }, + navbar: { + style: 'dark', + title: 'openPYPE', + logo: { + src: 'img/logos/splash_main.svg' + }, + items: [ + { + to: '/features', + label: 'Features', + position: 'left' + }, { + to: 'docs/artist_getting_started', + label: 'User Docs', + position: 'left' + }, { + to: 'docs/system_introduction', + label: 'Admin Docs', + position: 'left' + }, + { + href: 'https://pype.club', + label: 'pypeclub', + position: 'right', + },{ + href: 'https://github.com/pypeclub', + label: 'Github', + position: 'right', + }, + ] + }, + footer: { + style: 'dark', + links: [ + { + title: 'Pages', + items: [ + { + label: 'Features', + to: 'features', + }, + { + label: 'Artist', + to: 'docs/artist_getting_started', + }, + { + label: 'Admin', + to: 'docs/admin_getting_started', + } + ] + }, + { + title: 'Community', + items: [ + { + label: 'Avalon Chat', + to: 'https://gitter.im/getavalon/Lobby', + }, + { + label: 'OpenPype Chat', + to: 'https://discord.gg/sFNPWXG', + }, + { + label: 'Github Discussions', + to: 'https://github.com/pypeclub/pype/discussions', + } + ], + }, + ], + copyright: 'Copyright © 2021 Orbi Tools', + }, + algolia: { + apiKey: '5e01ee3bfbb744ca6f25d4b281ce38a9', + indexName: 'openpype', + // Optional: see doc section bellow + contextualSearch: true, + // Optional: Algolia search parameters + searchParameters: {}, + }, + googleAnalytics: { + trackingID: 'G-HHJZ9VF0FG', + // Optional fields. + anonymizeIP: false, // Should IPs be anonymized? + }, + }, + stylesheets: [ + 'https://use.fontawesome.com/releases/v5.7.2/css/all.css' + ], +}; diff --git a/website/package.json b/website/package.json new file mode 100644 index 0000000000..7bd8b4e77b --- /dev/null +++ b/website/package.json @@ -0,0 +1,27 @@ +{ + "name": "pype-documentation", + "scripts": { + "examples": "docusaurus-examples", + "start": "docusaurus start", + "build": "docusaurus build", + "publish-gh-pages": "docusaurus-publish", + "write-translations": "docusaurus-write-translations", + "version": "docusaurus-version", + "rename-version": "docusaurus-rename-version", + "swizzle": "docusaurus swizzle", + "deploy": "docusaurus deploy", + "docusaurus": "docusaurus" + }, + "dependencies": { + "@docusaurus/core": "2.0.0-alpha.72", + "@docusaurus/preset-classic": "2.0.0-alpha.72", + "classnames": "^2.2.6", + "clsx": "^1.1.1", + "react": "^16.10.2", + "react-dom": "^16.10.2", + "react-popupbox": "^2.0.8", + "remarkable-admonitions": "^0.2.1", + "yarn": "^1.17.3" + }, + "devDependencies": {} +} diff --git a/website/publish.cmd b/website/publish.cmd new file mode 100644 index 0000000000..f203823bde --- /dev/null +++ b/website/publish.cmd @@ -0,0 +1,5 @@ +cd %~dp0 +set GIT_USER=mkolar +set CURRENT_BRANCH=develop +set USE_SSH=true +yarn deploy diff --git a/website/sidebars.js b/website/sidebars.js new file mode 100644 index 0000000000..82f063e252 --- /dev/null +++ b/website/sidebars.js @@ -0,0 +1,111 @@ +module.exports = { + artist: [ + { + type: "category", + collapsed: false, + label: "General", + items: [ + "artist_getting_started", + "artist_concepts", + "artist_publish", + "artist_tools", + ], + }, + { + type: "category", + collapsed: false, + label: "Integrations", + items: [ + "artist_hosts_nukestudio", + "artist_hosts_nuke", + "artist_hosts_maya", + "artist_hosts_blender", + "artist_hosts_harmony", + "artist_hosts_aftereffects", + "artist_hosts_photoshop", + "artist_hosts_unreal", + { + type: "category", + label: "Ftrack", + items: [ + "artist_ftrack", + "manager_ftrack", + "manager_ftrack_actions", + ], + } + ], + }, + ], + Admin: [ + "system_introduction", + { + type: "category", + label: "Getting Started", + items: [ + "dev_requirements", + "dev_build", + "admin_distribute", + "admin_use", + "dev_contribute", + "admin_openpype_commands", + ], + }, + { + type: "category", + label: "Configuration", + items: [ + "admin_settings", + "admin_settings_system", + "admin_settings_project_anatomy", + "admin_settings_project", + ], + }, + { + type: "category", + label: "Modules", + items: [ + "module_ftrack", + "module_site_sync", + "module_deadline", + "module_muster", + "module_clockify" + ], + }, + { + type: "category", + label: "Releases", + items: ["changelog", "update_notes"], + }, + { + type: "category", + collapsed: false, + label: "2.0 legacy docs", + items: [ + { + type: "category", + label: "Deployment", + items: [ + "pype2/admin_getting_started", + "pype2/admin_install", + "pype2/admin_config", + "pype2/admin_ftrack", + "pype2/admin_hosts", + "pype2/admin_pype_commands", + "pype2/admin_setup_troubleshooting", + ], + }, + { + type: "category", + label: "Configuration", + items: [ + "pype2/admin_presets_nukestudio", + "pype2/admin_presets_ftrack", + "pype2/admin_presets_maya", + "pype2/admin_presets_plugins", + "pype2/admin_presets_tools", + ], + }, + ], + }, + ], +}; diff --git a/website/src/components/BadgesSection/badges.js b/website/src/components/BadgesSection/badges.js new file mode 100644 index 0000000000..4bc85df2ef --- /dev/null +++ b/website/src/components/BadgesSection/badges.js @@ -0,0 +1,59 @@ +export default { + upper: [ + { + title: "License", + src: + "https://img.shields.io/github/license/pypeclub/pype?labelColor=303846", + href: "https://github.com/pypeclub/pype", + }, + { + title: "Release", + src: + "https://img.shields.io/github/v/release/pypeclub/pype?labelColor=303846", + href: "https://github.com/pypeclub/pype", + }, + { + title: "Requirements State", + src: + "https://img.shields.io/requires/github/pypeclub/pype?labelColor=303846", + href: + "https://requires.io/github/pypeclub/pype/requirements/?branch=main", + }, + { + title: "VFX Platform", + src: + "https://img.shields.io/badge/vfx%20platform-2021-lightgrey?labelColor=303846", + href: "https://vfxplatform.com", + }, + { + title: "GitHub last commit", + src: + "https://img.shields.io/github/last-commit/pypeclub/pype/develop?labelColor=303846", + href: "https://github.com/pypeclub/pype", + }, + { + title: "GitHub commit activity", + src: + "https://img.shields.io/github/commit-activity/y/pypeclub/pype?labelColor=303846", + href: "https://github.com/pypeclub/pype", + }, + { + title: "Repository Size", + src: + "https://img.shields.io/github/repo-size/pypeclub/pype?labelColor=303846", + href: "https://github.com/pypeclub/pype", + }, + { + title: "Forks", + src: + "https://img.shields.io/github/forks/pypeclub/pype?style=social&labelColor=303846", + href: "https://github.com/pypeclub/pype", + }, + { + title: "Discord", + src: + "https://img.shields.io/discord/517362899170230292?label=discord&logo=discord&logoColor=white&labelColor=303846", + href: "https://discord.gg/sFNPWXG", + }, + ], +}; diff --git a/website/src/components/BadgesSection/index.js b/website/src/components/BadgesSection/index.js new file mode 100644 index 0000000000..f782de2a52 --- /dev/null +++ b/website/src/components/BadgesSection/index.js @@ -0,0 +1,25 @@ +import React from 'react'; + +import badges from './badges'; +import styles from './styles.module.css'; +import {StarButton} from "../index"; + +const Badge = props => ( + + {props.title}/ + +); + +export default function BadgesSection() { + const {upper: upperBadges} = badges; + + return ( +
+
+ {upperBadges.map((badge, index) => ( + + ))} +
+
+ ); +}; diff --git a/website/src/components/BadgesSection/styles.module.css b/website/src/components/BadgesSection/styles.module.css new file mode 100644 index 0000000000..4db99e7e06 --- /dev/null +++ b/website/src/components/BadgesSection/styles.module.css @@ -0,0 +1,17 @@ +.badgesSection { + margin-bottom: 5em; +} +.upperBadges, +.lowerBadges { + display: flex; + flex-wrap: wrap; + justify-content: center; +} +.upperBadges { + margin-bottom: 17px; +} +.upperBadges a, +.lowerBadges a { + margin-left: 2px; + margin-right: 2px; +} diff --git a/website/src/components/GithubButton/index.js b/website/src/components/GithubButton/index.js new file mode 100644 index 0000000000..b1950a8d6f --- /dev/null +++ b/website/src/components/GithubButton/index.js @@ -0,0 +1,30 @@ +import React from 'react'; +import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; + +export function StarButton() { + const context = useDocusaurusContext(); + const {siteConfig = {}} = context; + + return + T-Regx + ; +} + +export function SponsorButton() { + return
+