Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
next-version: 2.0.0
branches:
main:
increment: Patch
Expand Down
13 changes: 12 additions & 1 deletion Paramood/Paramood.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def notify(self, args):
'parameters.delete',
'parameters.rename',
'parameters.favorite',
'variants.save',
'variants.table.save',
'variants.apply',
'variants.delete',
'variants.free',
Expand Down Expand Up @@ -366,6 +366,16 @@ def notify(self, args):
_broadcast('state.changed', {})


class TimelineSelectionChanged(adsk.core.ActiveSelectionEventHandler):
def notify(self, args):
try:
if _adapter and 'parameters' in _ready_modes and _ui.activeCommand == 'SelectCommand':
_send('parameters', 'variants.selection', _adapter._variant_timeline_selection())
except Exception:
if _app:
_app.log(traceback.format_exc())


def _definition(identifier, name, handler):
existing = _ui.commandDefinitions.itemById(identifier)
if existing:
Expand Down Expand Up @@ -400,6 +410,7 @@ def run(context):
for event in (_app.documentClosed, _app.documentOpened):
_listen(event, DocumentChanged())
_listen(_ui.commandTerminated, ExternalCommandEnded())
_listen(_ui.activeSelectionChanged, TimelineSelectionChanged())
_listen(_ui.workspaceActivated, WorkspaceChanged())
if _adapter._design():
_show_palette('parameters')
Expand Down
4 changes: 3 additions & 1 deletion Paramood/bridge/protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ def dispatch(adapter, message):
'parameters.delete',
'parameters.rename',
'parameters.favorite',
'variants.save',
'variants.table.save',
'variants.selection.get',
'variants.cell.preview',
'variants.apply',
'variants.delete',
'variants.free',
Expand Down
54 changes: 50 additions & 4 deletions Paramood/core/variants.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def decode_variants(raw):
if not raw:
return []
data = json.loads(raw)
if not isinstance(data, dict) or data.get('version') != 1:
if not isinstance(data, dict) or data.get('version') != 2:
raise ValueError('Unsupported variants format.')
variants = data.get('variants')
if not isinstance(variants, list):
Expand All @@ -26,7 +26,7 @@ def decode_variants(raw):
ids.add(identity)
names.add(name.casefold())
entries = variant.get('parameters')
if not isinstance(entries, list) or not entries:
if not isinstance(entries, list):
raise ValueError('A variant needs at least one parameter.')
tokens = set()
for entry in entries:
Expand All @@ -46,12 +46,51 @@ def decode_variants(raw):
raise ValueError('Invalid text variant value.')
elif type(value) not in (float, int) or not math.isfinite(value):
raise ValueError('Invalid variant parameter value.')
features = variant.get('features', [])
if not isinstance(features, list):
raise ValueError('Invalid variant features.')
feature_tokens = set()
for entry in features:
if (
not isinstance(entry, dict)
or any(
not isinstance(entry.get(k), str) or not entry[k]
for k in ('name', 'entityToken')
)
or type(entry.get('enabled')) is not bool
or entry['entityToken'] in feature_tokens
):
raise ValueError('Invalid variant feature.')
feature_tokens.add(entry['entityToken'])
columns = data.get('columns')
if not isinstance(columns, list) or (variants and not columns):
raise ValueError('Select at least one parameter or feature.')
keys = set()
for column in columns:
if (
not isinstance(column, dict)
or column.get('kind') not in ('parameter', 'feature')
or any(
not isinstance(column.get(k), str) or not column[k] for k in ('name', 'entityToken')
)
or (column['kind'], column['entityToken']) in keys
or (column['kind'] == 'parameter' and not isinstance(column.get('unit'), str))
):
raise ValueError('Invalid or duplicate table column.')
keys.add((column['kind'], column['entityToken']))
parameter_tokens = [c['entityToken'] for c in columns if c['kind'] == 'parameter']
feature_tokens = [c['entityToken'] for c in columns if c['kind'] == 'feature']
for variant in variants:
if [p['entityToken'] for p in variant['parameters']] != parameter_tokens or [
f['entityToken'] for f in variant.get('features', [])
] != feature_tokens:
raise ValueError('All variants must use the same ordered parameters and features.')
return variants


def encode_variants(variants):
def encode_variants(variants, columns):
raw = json.dumps(
{'version': 1, 'variants': variants},
{'version': 2, 'columns': columns, 'variants': variants},
ensure_ascii=False,
allow_nan=False,
separators=(',', ':'),
Expand All @@ -62,6 +101,13 @@ def encode_variants(variants):
return raw


def decode_variant_table(raw):
"""Only the major-version-2 table format is supported."""
variants = decode_variants(raw)
data = json.loads(raw) if raw else {'version': 2, 'columns': []}
return {'version': 2, 'columns': data['columns'], 'variants': variants}


def variants_token(raw):
return hashlib.sha256(raw.encode('utf-8')).hexdigest()

Expand Down
15 changes: 15 additions & 0 deletions Paramood/fusion/adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,13 @@ def state(self):
}
)
variant_state = self._variants_state(design)
controlled = {
column['name']
for column in variant_state.get('variantColumns', [])
if column['kind'] == 'parameter' and not column.get('missing')
}
for parameter in parameters:
parameter['configured'] = parameter['name'] in controlled
return {
'documentId': self._document_id,
'draftId': self._draft_id,
Expand Down Expand Up @@ -391,6 +398,10 @@ def _snapshot_token(self, design, text):
sorted(parameters),
self._variant_sessions.get(self._draft_id),
self._read_variants(design)[1],
self._variant_feature_snapshot(design)
if text == 'variants'
or any(c['kind'] == 'feature' for c in self._read_variant_table(design)[0]['columns'])
else [],
]
return hashlib.sha256(
json.dumps(payload, ensure_ascii=True, allow_nan=False).encode('utf-8')
Expand Down Expand Up @@ -649,6 +660,10 @@ def _execute_direct_batch(self, design, ops):
return {'created': [], 'updated': [op.name for op in ops]}

def request(self, action, payload):
if action == 'variants.cell.preview':
return self._preview_variant_cell(payload)
if action == 'variants.selection.get':
return self._variant_timeline_selection()
if action.startswith('variants.'):
return self._request_variant(action, payload)
if action == 'document.units':
Expand Down
Loading
Loading