Commit Graph

206 Commits

Author SHA1 Message Date
8f9fddd512 Add-on: silence mypy error
Mypy doesn't know the `bl-rna` property exists.

No functional changes.
2023-07-13 12:56:03 +02:00
33aa44e623 Add-on: remove accidental debug print 2023-07-13 12:55:11 +02:00
3a3e664ae2 Add option to make a job setting auto-evaluatable by the user
Add a new job setting option `autoevalLockable`. Setting this to `true` in
the job compiler's `JOB_TYPE` settings has the following effect:

- By default, the setting will not be editable in Blender's job submission
  interface. Instead, a toggle button with a 'car' icon will be shown.
- When the 'car' button is toggled off, the setting becomes editable again.

In its default, uneditable state, the setting will be auto-evaluated before
submission.

This makes it possible to 'lock in' auto-evaluation. The main use case is
for the frame range of the render job. By default this will be locked to
the scene frame range, but it can still be overridden if a different
range is wanted.
2023-07-13 12:07:02 +02:00
168305f785 OAPI: regenerate code 2023-07-13 12:06:21 +02:00
Eveline Anderson
830c3fe794 Rename worker 'clusters' to 'tags'
As it was decided that the name "tags" would be better for the clarity
of the feature, all files and code named "cluster" or "worker cluster"
have been removed and replaced with "tag" and "worker tag". This is only
a name change, no other features were touched.

This addresses part of #104204.

Reviewed-on: https://projects.blender.org/studio/flamenco/pulls/104223

As a note to anyone who already ran a pre-release version of Flamenco
and configured some worker clusters, with the help of an SQLite client
you can migrate the clusters to tags. First build Flamenco Manager and
start it, to create the new database schema. Then run these SQL queries
via an sqlite commandline client:

```sql
insert into worker_tags
    (id, created_at, updated_at, uuid, name, description)
  select id, created_at, updated_at, uuid, name, description
  from worker_clusters;

insert into worker_tag_membership (worker_tag_id, worker_id)
  select worker_cluster_id, worker_id from worker_cluster_membership;
```
2023-07-10 11:11:03 +02:00
Eveline Anderson
341dc6c8e2 OAPI: regenerate code 2023-07-10 11:08:44 +02:00
82456424c9 OAPI: regenerate code 2023-07-06 12:19:48 +02:00
86514b9342 Remove the 'None' project finder, set 'blender project' as default
The 'None' project finder is the old behaviour of the add-on, and it is not
really necessary. If any of the other finders cannot find the directory
they're looking for, they'll return the current blend file's directory
anyway.

The new default is 'blender project'.
2023-06-01 16:34:13 +02:00
f4f61ea593 Add 'project finders' to the add-on
The Flamenco add-on can now find the top-level directory of your Blender
project. It can be configured to find any of these directories:

- `.blender_project`
- `.git`
- `.subversion`
- None, which is the default and the old behaviour of just using the
  directory of the current blend file as the 'project directory'.
2023-06-01 16:07:11 +02:00
fbc7c0cfd9 Fix mypy errors
Mypy doesn't understand Blender property annotations.
2023-06-01 15:51:44 +02:00
16da14479b OAPI: regenerate code 2023-05-26 11:25:51 +02:00
ef53304b1b Fix #104206: Worker cluster assignment is lost when blender is restarted
The available worker clusters are stored on the addon preferences, to be
available across restarts of Blender. The prefs were not marked as 'dirty'
though, so Blender never actually saved them. That's now resolved.
2023-04-24 12:42:45 +02:00
0e0fddc076 Add-on: Change 'No Cluster' to 'All'
In the 'Cluster' drop-down, change the label and tooltip of the 'No
Cluster' option. The functionality is still the same, it causes the job
to be submitted without cluster assigned. The wording now reflect
Flamenco's behaviour better, instead of describing this technical aspect.

Old: "No Cluster", "No cluster assigned, any worker can handle this job"
New: "All", "No specific cluster assigned, any worker can handle this job"
2023-04-08 11:30:25 +02:00
f5ab2bb4c2 OAPI: regenerate code 2023-04-04 13:18:59 +02:00
2a6cbcf030 Addon: Add worker cluster support
Worker clusters can be fetched from the Manager, and submitted jobs can
be assigned to those clusters.
2023-04-04 12:19:44 +02:00
675d966263 OAPI: regenerate code 2023-04-04 12:18:17 +02:00
996f5da2af Bumped version to 3.3-alpha0 2023-03-21 12:22:38 +01:00
9e1948a1a0 Bump version to v3.2 2023-02-21 12:09:08 +01:00
Nitin-Rawat-1
4efed64a77 Fix error submitting job when not using Shaman
Fix #104183: Error submitting job to flamenco manager.

The bug happened when a user, using filesystem as storage solution,
would try to submit the job to the flamenco manager. The user would be shown
an Error -> Error packing with BAT: 'Packer' object has no attribute 'actual_checkout_path'.

The fix was to account for multiple implementations of the Packer object.

Reviewed-on: https://projects.blender.org/studio/flamenco/pulls/104184
2023-02-17 11:06:07 +01:00
80e0d0fc18 Bumped version to 3.2-beta 2023-02-07 15:38:14 +01:00
c21cc7d316 OAPI: regenerate code 2023-02-03 16:44:55 +01:00
067f2a439e OAPI: regenerate code 2023-01-08 13:47:38 +01:00
2e5f5ffadd OAPI: regenerate code 2023-01-04 01:18:21 +01:00
f413a40f4e Store Shaman checkout ID when submitting a job
If Shaman is used to submit the job files, store the job's checkout ID
(i.e. the path relative to the checkout root) in the database. This will
make it possible in the future to remove the Shaman checkout along with
the job itself.
2023-01-04 01:18:21 +01:00
bb41889f1c OAPI: regenerate code 2023-01-04 01:18:21 +01:00
7f268f2177 Add-on: abort submission when job preparation fails
Job preparation (that is, constructing the data to be sent to the Flamenco
API) shouldn't fail, but in case it does, it should stop the rest of the
submission process.
2023-01-04 01:18:21 +01:00
84470eeb81 Bump Blender Asset Tracer (BAT) to version 1.15
Bump BAT from 1.14 to 1.15 to add support for fluid sim caches.
2022-12-16 15:28:52 +01:00
4ef5373756 Add-on: add support for the use_all_linked_data_direct option
Add support for Blender's `use_all_linked_data_direct` experimental
option. This is a workaround for an issue with BAT, for which a quick
solution is required by the Blender Studio (production crunch).

Flamenco writes the `.flamenco.blend` file with
`preferences.experimental.use_all_linked_data_direct` set to `True`, so
that BAT has an easier time finding linked assets.
2022-12-02 14:31:23 +01:00
Yann Doersam
1cef0d48df Addon: Show error if the file path is not known before submitting
If file has never been saved, Flamenco cannot create a temp copy to
submit. This caused an exception, which is now avoided by showing a
clear error message instead.

Maniphest Tasks: T102192

Differential Revision: https://developer.blender.org/D16358
2022-11-08 11:48:10 +01:00
074c60df9d Cleanup: add-on, reformat with black
No functional changes.
2022-10-20 13:14:51 +02:00
32a3e48e24 Add-on: use job check endpoint before sending files to the farm 2022-10-20 13:14:01 +02:00
c439bc3a1e OAPI: regenerate code 2022-10-20 13:13:22 +02:00
70bb0c2655 Bumped version to 3.2-alpha 2022-10-20 12:10:30 +02:00
8a36cf1d38 Bumped version to 3.1 2022-10-18 10:57:13 +02:00
Andrew
0bc0a7ac9b Fix issue submitting to Shaman from Windows machine
Fix a BAT error that arises when submitting a job from a Windows
workstation to a Shaman flamenco system. BAT expects an absolute path,
but on Windows systems, absolute paths begin with a drive letter.

This patch adds an arbitrary drive letter, and later removes it once the
relative paths have been computed.

Reviewed by: sybren

Differential Revision: https://developer.blender.org/D16084
2022-10-13 15:56:30 +02:00
94015cc3ee Cleanup: Add-on, add comment to clarify a Shaman-specific function 2022-10-06 14:41:50 +02:00
c6ede93fc1 OAPI: regenerate code 2022-09-30 16:28:16 +02:00
c42b8fec29 Bumped version to 3.1-alpha 2022-09-27 12:31:14 +02:00
11785ca51c Bumped version to 3.0 2022-09-12 15:49:12 +02:00
ddfe3199d0 Add-on: report which files were missing
After submission, list the missing files on the terminal (if there are
any).
2022-09-12 15:41:03 +02:00
e7aa637ed5 Add-on: update to BAT 1.14
BAT 1.14 improves some progress reporting when packing files, so it now
properly shows which file is being investigated in the Flamenco UI.
2022-09-12 15:34:27 +02:00
6185a428a8 Add-on: much faster processing of BAT progress messages
BAT-packing is a multi-threaded operation, so messages about its progress
are queued up in a thread-safe manner. The modal operator was only handling
4 messages per second, causing major slowdowns when there are lots of
small files to be processed. This is now done much faster, and thus the
UI shouldn't lag behind of the actual submissions progress.
2022-09-12 15:33:37 +02:00
de500ba1df Bumped version to 3.0-beta3 2022-08-31 17:50:46 +02:00
fa69cc102b Add-on: clearer error message when job compiler refuses the job
Blender now shows the actual returned error from the Manager when job
submission fails, rather than a generic "failed" message.
2022-08-31 16:22:34 +02:00
6f876658c1 Add-on: remove debug print 2022-08-31 16:04:00 +02:00
de8da6eac5 Bumped version to 3.0-beta2 2022-08-31 12:10:02 +02:00
3ecdeacc80 Add-on: fix wrong parameter being passed 2022-08-31 12:08:46 +02:00
31cf0a4ecc Implement getSharedStorage operation & use it in the add-on
Implement the `getSharedStorage` operation in the Manager, and use it in
the add-on to get the shared storage location in a way that makes sense
for the platform of the user.

Manifest task: T100196
2022-08-31 11:44:37 +02:00
0a1e1efc41 OAPI: regenerate code 2022-08-31 11:42:46 +02:00
bb377e7572 Add-on: fix typo causing an AttributeError 2022-08-31 11:37:16 +02:00