blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
349 Commits 1 Branch 0 Tags
Commit Graph

349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sybren A. Stüvel
6c827ffc52 Shaman: only configure the root directory of the Shaman files 
Flamenco v2 allowed separate configuration of the Shaman file store and
checkout paths. This is now just one setting for "the storage". The file
store will be in `{storage}/file-store` and the checkout will happen in
`{storage}/jobs`.
 2022-03-25 14:32:42 +01:00
Sybren A. Stüvel
65fcf1f6c9 Manager: disable Shaman by default 
The Shaman implementation isn't finished yet, so for now disable by
default. That way it's at least possible to merge to the main branch.
 2022-03-25 14:10:26 +01:00
Sybren A. Stüvel
4b9501590e Shaman: only add random suffix to checkout dir if already existing 
Only add a random suffix to the checkout dir if it is necessary to ensure
uniqueness. If the client-supplied checkout directory doesn't exist yet,
it will be used as-is.
 2022-03-25 14:10:26 +01:00
Sybren A. Stüvel
724938c7ae Shaman: allow Manager to determine the final checkout path 
The checkout request now responds with the final checkout path. This makes
it possible for the Manager to ensure the checkout is unique.
 2022-03-25 14:10:26 +01:00
Sybren A. Stüvel
0e682282f0 Addon: fix mypy errors 2022-03-25 14:10:26 +01:00
Sybren A. Stüvel
2e4ada2ade Manager: add 'shaman' prefix to logging 2022-03-25 14:10:26 +01:00
Sybren A. Stüvel
7e035ec3bf Manager: check returned error of touchfile call 2022-03-25 14:10:26 +01:00
Sybren A. Stüvel
eeeec23f43 Cleanup, fix typo in OAPI description 2022-03-25 14:10:26 +01:00
Sybren A. Stüvel
ccf45f2f6c Manager: add Shaman checkout test 2022-03-25 14:10:26 +01:00
Sybren A. Stüvel
d0139e8270 Addon: add wheel for BAT 1.12 2022-03-25 14:10:26 +01:00
Sybren A. Stüvel
c69e0909ae Shaman submission is working! 2022-03-25 14:10:26 +01:00
Sybren A. Stüvel
21227c8046 More Shaman integration work 
- Addon switches between filesystem-packing and Shaman-packing
  automatically, depending on whether the Manager has Shaman enabled.
- Actually using BAT for Shaman packing.

It doesn't work though, some error occurs when receiving Shaman response
from the Manager in the Addon.
 2022-03-25 14:10:26 +01:00
Sybren A. Stüvel
f9b7510c42 Streamlining Shaman protocol further, plus rough implementation for addon 2022-03-25 14:10:26 +01:00
Sybren A. Stüvel
668bfbc492 Addon: Upgrade Python version to 3.10 2022-03-25 14:10:26 +01:00
Sybren A. Stüvel
8eedaff6a1 git-ignore shaman-file-storageflamenco/bat/interface.py:232 2022-03-25 14:10:26 +01:00
Sybren A. Stüvel
b2288e7f28 Manager: More work on Shaman support 
This introduces some more conceptual changes to Shaman. The most important
one is that there is no longer a "checkout ID", but a "checkout path".
The Shaman client can request any subpath of the checkout directory,
so that it can handle things like project- or scene-specific prefixes.
 2022-03-25 14:10:26 +01:00
Sybren A. Stüvel
2b0d154a07 Manager: more work on Shaman integration 2022-03-25 14:10:26 +01:00
Sybren A. Stüvel
6f35b3303d Manager: more work on porting Shaman code to Flamenco 3 2022-03-25 14:10:26 +01:00
Sybren A. Stüvel
4df0543661 Manager: Implementation of Shaman OAPI interface 
This hooks up the OpenAPI Shaman endpoints to a Shaman interface. This
interface doesn't have any implementation yet.
 2022-03-25 14:10:26 +01:00
Sybren A. Stüvel
4e8e71e4e2 Initial checkin of Shaman of Flamenco 2 
This is not yet working, it's just a direct copy of the Manager of Flamenco
2, with Logrus replaced by Zerolog. The API has been documented in
flamenco-manager.yaml as a starting point for the integration.
 2022-03-25 14:10:26 +01:00
Sybren A. Stüvel
c9dbb2620b Manager: add GZip middleware 
Add support for GZip-compressed streams. This becomes increasingly
important when Shaman support gets added, as the blend files typically
used in studios are uncompressed to support binary diffing.
 2022-03-21 13:24:07 +01:00
Sybren A. Stüvel
1635179da0 Addon: unregister handlers 2022-03-17 17:25:45 +01:00
Sybren A. Stüvel
e6f224feca Worker: change database filename to flamenco-worker.sqlite 
This makes the Worker and Manager use similarly-named SQLite databases.
 2022-03-17 17:13:12 +01:00
Sybren A. Stüvel
d87cba6d7c Makefile: add make package target 
Add a simple way to create a download bundle. Not yet complete, but useful
for demo at the weekly.
 2022-03-17 16:54:37 +01:00
Sybren A. Stüvel
dd25190f81 Addon: automatically adjust job name for blend file name 
The Flamenco job name is set to the blend file name, unless it was already
set to something else.
 2022-03-17 16:45:02 +01:00
Sybren A. Stüvel
86879aaaad Manager: adjust unit test to fit new command/task names in job compiler 2022-03-17 16:19:45 +01:00
Sybren A. Stüvel
b6a7a15582 Implement frames-to-video command 
This finishes the "Simple Blender Render" job type, as it can now be run
fully by a Worker!
 2022-03-17 16:18:10 +01:00
Sybren A. Stüvel
5ea3bfe301 Worker: reduce logging 2022-03-17 15:39:59 +01:00
Sybren A. Stüvel
c989bce51e Implement move-directory command, and use it in Simple Blender Render 2022-03-17 15:39:52 +01:00
Sybren A. Stüvel
9096ee0533 Manager: disable periodic VACUUM 2022-03-17 15:38:14 +01:00
Sybren A. Stüvel
084712baba Simple Blender render: pass frame range in Blender notation 
Pass the frame range in Blender notation (`n..m`) instead of "printer"
notation (`n-m`).
 2022-03-17 13:08:37 +01:00
Sybren A. Stüvel
1bcf4139bf Worker: be a bit faster in requesting a new task 2022-03-17 13:07:48 +01:00
Sybren A. Stüvel
8d52a03648 Manager: fix bug in task scheduler 
The task scheduler was handing out tasks for which any dependency (instead
of all dependencies) were completed.
 2022-03-17 13:07:20 +01:00
Sybren A. Stüvel
c5a2a23f6e Manager: reduce log levels 2022-03-17 11:47:53 +01:00
Sybren A. Stüvel
ec77de886b Manager: remove invalid comment 2022-03-17 11:46:04 +01:00
Sybren A. Stüvel
517b007ae5 Manager: improve logging of created tasks 2022-03-17 11:45:56 +01:00
Sybren A. Stüvel
bedf7869f8 Manager: replace "direction=twoway" with "is_twoway=true" in config 
A boolean provides less context to the setting, so it's not as easy to
understand. However, in this case the simple case will have `is_twoway=false` and be ommitted from the configuration file. This makes the simple case even simpler.
 2022-03-17 11:33:41 +01:00
Sybren A. Stüvel
5728884fed FEATURES: add issue with "add task" log entry 2022-03-17 11:25:58 +01:00
Sybren A. Stüvel
3c01c18634 Manager: remove unsupported settings & rename existing one 
Comment out all unused-but-desired-in-the-future settings, remove some
settings that will never be used, and rename `ssdp_discovery` to
`autodiscoverable`.
 2022-03-17 11:25:40 +01:00
Sybren A. Stüvel
882c5ee478 Manager: include the version of Flamenco Manager in the written config 2022-03-17 11:19:00 +01:00
Sybren A. Stüvel
50cc1e64d0 Manager: add -write-config CLI option to create config file and quit 2022-03-17 11:18:26 +01:00
Sybren A. Stüvel
3f081d8c7b Update debug-job-render.sh to use current settings 2022-03-17 11:10:27 +01:00
Sybren A. Stüvel
dbc5109058 Manager: reduce logging of configuration service 2022-03-17 11:10:13 +01:00
Sybren A. Stüvel
22ea599554 Manager: periodically run the SQL VACUUM command 2022-03-17 11:03:29 +01:00
Sybren A. Stüvel
e7a5e0565d FEATURES: add new feature idea 2022-03-17 10:53:15 +01:00
Sybren A. Stüvel
93616cef3a Manager: reduce log level of "worker requesting task" 2022-03-17 10:53:00 +01:00
Sybren A. Stüvel
d3a3543fdc Features: add more things to do 2022-03-15 19:21:40 +01:00
Sybren A. Stüvel
59f58d92b8 Addon: add file browser buttons to file/directory path settings/properties 2022-03-15 18:45:28 +01:00
Sybren A. Stüvel
6764ee8259 Addon: actually allow setting the job storage path 2022-03-15 18:37:48 +01:00
Sybren A. Stüvel
1fcbba79d7 Cleanup: addon, fix MyPy error 2022-03-15 18:36:53 +01:00