Compare commits
641 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f20fc7edb3 | |||
| 0cd0c3a1f6 | |||
| 2594ce0382 | |||
| ec67f5ba48 | |||
| db61d2e99c | |||
| 69090f6eb1 | |||
| 99f0b3516a | |||
| f69ee07a94 | |||
| 1d246c921a | |||
| 80b5982424 | |||
| d06f0b5b4e | |||
| a6790c7c70 | |||
| 7bc78b6bf9 | |||
| f584ad84ed | |||
| 55bc1b2fa5 | |||
| 87720c1d6c | |||
| ed8df12e54 | |||
| a8a5296d7e | |||
| 4f82c0f43d | |||
| f5e024c8ce | |||
| 3bcdf723b0 | |||
| adc1105b3a | |||
| fa9877b6da | |||
| 2929e2f93b | |||
| 6636950705 | |||
| 79c0106f57 | |||
| f4d73ff1ae | |||
| 7ea719141f | |||
| a47f568f69 | |||
| b174802451 | |||
| 87a7e7482d | |||
| e888339dda | |||
| 3417557405 | |||
| 8aba21de01 | |||
| 4ce61f4e89 | |||
| 6d6e1e7650 | |||
| 95de5cbb30 | |||
| 5f56818d63 | |||
| 825097e1a6 | |||
| d3ab26240a | |||
| ce6be1a98e | |||
| 213e73dfdd | |||
| 15129df7ce | |||
| 88519ce8b0 | |||
| d4f94450a5 | |||
| 4c46201526 | |||
| 75b064b3c7 | |||
| 1198f2e2ad | |||
| 7ab787bfb1 | |||
| bbbf373b50 | |||
| f34e4a2874 | |||
| 45ebc375ad | |||
| 4c41fa79fc | |||
| 0aa14ca077 | |||
| 6bfdf8850c | |||
| 22ecd2c2b3 | |||
| f7f9f73e7b | |||
| a7bada391b | |||
| 81ff5d82cb | |||
| d25edbb3d7 | |||
| 7dedff68f4 | |||
| 12b9602577 | |||
| d6e31a9752 | |||
| 09c61424d7 | |||
| e9bdf0ceb8 | |||
| 7e6174ebc1 | |||
| b8ae3ca8c8 | |||
| d690c45b35 | |||
| 5d3a824986 | |||
| 6f56ecb0c0 | |||
| ef5a570dd4 | |||
| 424d7d9caf | |||
| 6aa643837a | |||
| 32cbb33e10 | |||
| 51ae6f5978 | |||
| b64dde152a | |||
| d1b6755997 | |||
| da6e2d92e0 | |||
| 37e9c2372f | |||
| a620a358d3 | |||
| fd46fbd961 | |||
| 732f28e653 | |||
| 7671998541 | |||
| cab9674803 | |||
| 6c33c61a6d | |||
| 71afb1275f | |||
| 1b53410a86 | |||
| 1ba6983573 | |||
| d5a36fa5e3 | |||
| b6e47fb820 | |||
| 06e21154c4 | |||
| adc0c40ab7 | |||
| a44bb92ec4 | |||
| bd98244869 | |||
| 2acfa48b98 | |||
| a0283b6048 | |||
| 0e771a68b8 | |||
| 838f9d4969 | |||
| 88b17db901 | |||
| f98c804094 | |||
| 0382c246b8 | |||
| 0b38fb5a2a | |||
| 405972f681 | |||
| ff686b4361 | |||
| 7857451ec9 | |||
| 0fbfff54d4 | |||
| 826dadc8c8 | |||
| b9e4ee2b23 | |||
| 78c55b787f | |||
| 34f2dc2ab6 | |||
| a658e12cda | |||
| 85aa938fc2 | |||
| 010fb83ea6 | |||
| 7a291ce2f6 | |||
| 989c975c86 | |||
| 516eff4d8b | |||
| 0650210601 | |||
| b0b8140363 | |||
| d25f30b20d | |||
| b4e2f37b7f | |||
| b7ba2196f3 | |||
| 17cbcc38ba | |||
| 9afb2c5c1c | |||
| eb13c9bc70 | |||
| a33588f3af | |||
| 970cf62e50 | |||
| 513594c49f | |||
| 37c8e6dfb1 | |||
| 3859a88c4b | |||
| dfa8fc99d9 | |||
| ee97f3b718 | |||
| e0b48f6123 | |||
| 6fb6418d16 | |||
| ce104adb50 | |||
| fe0a8eb9f5 | |||
| 6279dd3885 | |||
| 811c5843a9 | |||
| 035cd089e2 | |||
| 6daef049bb | |||
| d526c8ce3e | |||
| 4c91032718 | |||
| ffb80457bc | |||
| d380e6eaf8 | |||
| ace7c390c1 | |||
| c052dfad46 | |||
| 66802726b9 | |||
| b8f4150fb7 | |||
| 255133010f | |||
| aea9bb3e1d | |||
| 5ca5334730 | |||
| ba5f40a749 | |||
| 04fc0fa715 | |||
| 2e80646d2c | |||
| fe6c18e97b | |||
| 7c9058172f | |||
| a82187589f | |||
| d811b010ff | |||
| e1e5d9dbb6 | |||
| b17423b282 | |||
| 166b0f5e87 | |||
| cac34120a9 | |||
| 55c4c68cf3 | |||
| be850d5ea9 | |||
| c9a5badac1 | |||
| 118fa07e37 | |||
| d71b616e2b | |||
| 35750f12c5 | |||
| 5730cdcb43 | |||
| 82b6dbbe78 | |||
| 883be4b27b | |||
| 37e2711a76 | |||
| 8dcc67fb31 | |||
| ed84820995 | |||
| 5c3dcb7bc0 | |||
| 92732e3c76 | |||
| 903951547d | |||
| 82c3dc9ffb | |||
| a0e10aae99 | |||
| bbea2a0d76 | |||
| a05ac3479b | |||
| 0bd972945e | |||
| f200544065 | |||
| 68ce9823ae | |||
| a920352407 | |||
| 24bfb6718e | |||
| e63f4b8636 | |||
| 47c6bd89af | |||
| bd38dfacc7 | |||
| 281483f0fc | |||
| 932838de8f | |||
| a0b39e4c64 | |||
| 759cd0ef58 | |||
| 46c18bbe6b | |||
| 82d39e66fe | |||
| 10f7499182 | |||
| 170d2f0450 | |||
| 040a4e2553 | |||
| e978e4f632 | |||
| eae60160a1 | |||
| c78a780e85 | |||
| 1b45f50697 | |||
| be8fae3b1c | |||
| ab41d3cbe0 | |||
| f843bb0c89 | |||
| b7933e0088 | |||
| 7e09d4f4ce | |||
| bb62109332 | |||
| 3642731f37 | |||
| 3bd849c815 | |||
| 2acf4c41c7 | |||
| 6b6ff80bf2 | |||
| 0f1f00db00 | |||
| 280927b720 | |||
| 6096cd25f6 | |||
| cc004c8e6b | |||
| a10b2594d3 | |||
| 976a52bdc8 | |||
| 09ca501a74 | |||
| 225d4f02d4 | |||
| f1b51848cf | |||
| 08fb3f6cd7 | |||
| fe7909c913 | |||
| a00e16929d | |||
| 44d1ef9f93 | |||
| 404dbd1d1e | |||
| 537a504121 | |||
| 6c03dc82c8 | |||
| 780126528d | |||
| fe03d96ae2 | |||
| 078a6c8da8 | |||
| 905377dea1 | |||
| 62c5114cb3 | |||
| 43a5302a90 | |||
| addaa996ea | |||
| 3b5421a5bc | |||
| 88e8c86fa6 | |||
| d6843b9971 | |||
| 302a9f7f30 | |||
| ede9591c6a | |||
| c5b339d891 | |||
| 2e35fb9e5c | |||
| e6b822b0e3 | |||
| 239bc4b5b9 | |||
| 4eea15ddc1 | |||
| 204aa7466e | |||
| 24019e99f3 | |||
| 64492fafa5 | |||
| 3a8d634989 | |||
| f27650af3a | |||
| 6469b6f757 | |||
| b28db0881c | |||
| b0b442de23 | |||
| 32d2fe8ead | |||
| 9fd40eac23 | |||
| b22ba1f1f1 | |||
| 5e20fe7bf1 | |||
| 6da5da23c4 | |||
| 1b59f0b026 | |||
| 78123936d2 | |||
| dbc1aefed3 | |||
| e726345b0c | |||
| e074dbcced | |||
| 62e342b2cb | |||
| 804dd37639 | |||
| 64b61f54f5 | |||
| 58789ab234 | |||
| 2696fb74ba | |||
| 57e176af91 | |||
| 437483641c | |||
| 1e971b57c3 | |||
| f04be12ec8 | |||
| 51242928ca | |||
| 77b3be9145 | |||
| cc5abdf9cb | |||
| 4eca5144a8 | |||
| 8589663049 | |||
| 956f72dd6a | |||
| a2daa68c1c | |||
| d60feb73a2 | |||
| a0ca10ad20 | |||
| f6118f3336 | |||
| c7cd2f3e91 | |||
| b374bfefd0 | |||
| d716db251f | |||
| 6d7e7c5c4b | |||
| 7dcd9288ca | |||
| 7d99f48def | |||
| 4332a8faef | |||
| a1aee8b3fa | |||
| deb8ad50c5 | |||
| 558b25b1d1 | |||
| 4db0fa69fa | |||
| 1eca211c96 | |||
| f65173581a | |||
| 223c776c63 | |||
| ccccc53f59 | |||
| ae6fc85ab4 | |||
| 7ad0785c62 | |||
| 76e4ec1535 | |||
| 4e96aade51 | |||
| 7ca00b7b77 | |||
| bddf9c0c1c | |||
| bf3ab7da4c | |||
| 4dc148181e | |||
| 357859288d | |||
| 1ce61bdda8 | |||
| 42737c4ed2 | |||
| 62ee1a4b0a | |||
| d21373873c | |||
| e3716f6206 | |||
| f6917b0761 | |||
| 04764b17eb | |||
| dbe3d759f6 | |||
| f6ff484e66 | |||
| bd000395af | |||
| 10f49579fd | |||
| 1693465dfc | |||
| c3a7ead8f5 | |||
| d151a8d0ae | |||
| c0dd88cbdb | |||
| 71d3589e72 | |||
| 5bde1bc2d6 | |||
| 75e6f0229a | |||
| 5d7e71f357 | |||
| 6c223b6fb3 | |||
| e6131a7956 | |||
| 45b50e4f26 | |||
| d9b92490ec | |||
| 37c09fa56c | |||
| cbae4d300d | |||
| 2742c12e31 | |||
| 6dd0813089 | |||
| a1831b57db | |||
| 1ff3245531 | |||
| 3b4723a186 | |||
| efe9551c5e | |||
| 23a5087fbc | |||
| 52c8e37a5b | |||
| 6a6b3d4c3d | |||
| 8f32aa014e | |||
| 11c6221972 | |||
| 262be44423 | |||
| fd3d97cf5a | |||
| 9dba99ad26 | |||
| 2810598336 | |||
| f918582ed2 | |||
| 9181440c62 | |||
| 62912d4428 | |||
| 67cf41d721 | |||
| 4ad3761478 | |||
| 6e8e08ae94 | |||
| 6e7c36223f | |||
| b1f979a10a | |||
| d1ebd84cca | |||
| fe92e49c59 | |||
| fbbd6c0dd7 | |||
| 8ffe219111 | |||
| e4d087db3a | |||
| 2e8943e961 | |||
| f254defc6b | |||
| 541e3d961f | |||
| b02f183533 | |||
| 589198f5f1 | |||
| 948a56a07f | |||
| 3eed9a60fa | |||
| c169c4eeda | |||
| 32b5ef88a1 | |||
| 3a979318ad | |||
| 1e6321c7f1 | |||
| b5fb684864 | |||
| 65048cd01b | |||
| 9d2fd5bc42 | |||
| bd35fb59c3 | |||
| 4931c95d7c | |||
| 52d53db661 | |||
| 23ee28f851 | |||
| 791190a38c | |||
| 3c7feb0bec | |||
| 2b583fd822 | |||
| 8244e3ecc7 | |||
| 5ac9d80cbc | |||
| 5e2fbaa7c2 | |||
| 703ceaf369 | |||
| a5096c41ca | |||
| 972339454d | |||
| 34c11d5931 | |||
| 854ce9f77f | |||
| 7f926cf547 | |||
| 5e8b54e3b7 | |||
| 8bd46e4e64 | |||
| 91edd4f85b | |||
| 0cb6c7f682 | |||
| 125a4bbeed | |||
| 76c4074aed | |||
| 16164a57da | |||
| 3a225fa935 | |||
| 102850b894 | |||
| 5ac85c541b | |||
| cca7b18119 | |||
| 8a34b95128 | |||
| 46d7abbaee | |||
| 67e95caf5f | |||
| 04532ed645 | |||
| 7df175d9bb | |||
| 3912fa8860 | |||
| 34de2928ae | |||
| 8a91260887 | |||
| 88eea00787 | |||
| c57d57c009 | |||
| 708e3329e3 | |||
| f0e68845c0 | |||
| 434a4376b3 | |||
| d701bedcc7 | |||
| 6238150bd5 | |||
| 3e41e8cd8e | |||
| 3962126b54 | |||
| c99c25e848 | |||
| 1ef9b91e82 | |||
| c0cfe1471a | |||
| da838280c3 | |||
| 681872e5ff | |||
| e11c41e0f8 | |||
| ec651a9237 | |||
| ece957fb0f | |||
| 5338d8ac0f | |||
| e36ea70e8a | |||
| edf2afaa89 | |||
| e0b1b272c0 | |||
| 682e82057e | |||
| 473e5cfddb | |||
| 03cd989165 | |||
| 284d841a1e | |||
| 668fc5131f | |||
| 64926bd41d | |||
| 1c9b186ea5 | |||
| ed9f1ad818 | |||
| b83c30a1c9 | |||
| c079342a55 | |||
| 6aa29d9b30 | |||
| f456e4ddbb | |||
| dcd13224d0 | |||
| 06952a5991 | |||
| 6049049813 | |||
| 75b7d30bd6 | |||
| 19e26318fc | |||
| 798dc7ff6a | |||
| 0e4cff5904 | |||
| d1502c9072 | |||
| 869629e2a3 | |||
| 48b98294fb | |||
| 8205180e5d | |||
| a2fd21f541 | |||
| 08ac76cf09 | |||
| fbf19420fa | |||
| 44336addaf | |||
| 43c9a9cace | |||
| 99e9f773b8 | |||
| 189a5847cf | |||
| eb86b4881a | |||
| 64fca5f280 | |||
| 784e9c1326 | |||
| c7f5e0718b | |||
| d2685c5cf5 | |||
| 1b83e5a84b | |||
| 77e09b9780 | |||
| 402f750200 | |||
| a43e7471a4 | |||
| a4ed7ebb08 | |||
| e7eb7c67a9 | |||
| d547cdaac0 | |||
| 6f35c1bd20 | |||
| 420c73f484 | |||
| c2859475cc | |||
| 56e8d65e2b | |||
| 7885a6be8d | |||
| b19b85c9d1 | |||
| db4b2b7f87 | |||
| 77916995bc | |||
| 3dd56dc38e | |||
| ae42bec1c3 | |||
| ea7baf8eb5 | |||
| 6a9f4bf89b | |||
| 8352bb5c9a | |||
| fc34b876fd | |||
| 183993cfc5 | |||
| 9be3b4b93d | |||
| 0b14660115 | |||
| 68c4c682a0 | |||
| 4f93ddcaf3 | |||
| e842f651b9 | |||
| 7e1bec1aba | |||
| 1fb9a4f5fe | |||
| 1668c80bed | |||
| ac6ba87c68 | |||
| 3db8565f57 | |||
| a32822f4e3 | |||
| 40956927c8 | |||
| 4628f111ba | |||
| 9c952b432d | |||
| f075988e4b | |||
| 65c829404a | |||
| 85e7a72524 | |||
| 0533aa0139 | |||
| 04b733a241 | |||
| 01036c0f2e | |||
| 4d8ca534fe | |||
| e941efd95c | |||
| be9defbfa9 | |||
| dd54c69554 | |||
| 93c1ec9556 | |||
| 659c57e840 | |||
| 1cdd4ffc9c | |||
| 5ae022d2ed | |||
| 31ca59cea8 | |||
| c91f673dba | |||
| e2c8ef1b3d | |||
| b6b0a5a3a0 | |||
| f36d63a2cf | |||
| afb9065fb9 | |||
| fcc33f8989 | |||
| 2cf9b64221 | |||
| 990cf4eb2f | |||
| b25f2ab4bc | |||
| a8786c126d | |||
| a35f8936ca | |||
| d965cc0988 | |||
| 59a6950eed | |||
| 6804282fac | |||
| a3a22a43d5 | |||
| 08aaa41b6c | |||
| 07a3213ee9 | |||
| 7a46176803 | |||
| b75501addd | |||
| 15636dbe62 | |||
| 9a2061d900 | |||
| 8dc51fb936 | |||
| e805b8ac6e | |||
| 5a1d624979 | |||
| c8808b07b3 | |||
| 1a9b847c44 | |||
| f01fcb8e66 | |||
| 67499ab20c | |||
| ebb703e68d | |||
| ef5d41da5d | |||
| 851dd9c482 | |||
| 78074cf691 | |||
| be0daa419d | |||
| a7d1b9ce30 | |||
| 05756a8e9e | |||
| b50e658333 | |||
| 88248353ab | |||
| aec94f8f7f | |||
| e6b1604bc3 | |||
| de29b93b8b | |||
| 10aa8b59b6 | |||
| b86faa6a14 | |||
| 7430611c52 | |||
| ddd52f4af9 | |||
| 35bc6b0350 | |||
| 9585d46c4e | |||
| 1900fece8b | |||
| 344b7de557 | |||
| fd09e97a53 | |||
| 459bd0901f | |||
| ae7c4bc14d | |||
| 41f1823aae | |||
| 625bd5cd84 | |||
| 8812985c67 | |||
| c838835a65 | |||
| 361ba6bfcd | |||
| 8078a4b596 | |||
| 08b106464f | |||
| 0cfe5db674 | |||
| d9dbca2c68 | |||
| ab5b55871b | |||
| 2f87956154 | |||
| 6fc4ab1539 | |||
| 7f432e768d | |||
| d0eb364b3e | |||
| 936b2d8b5a | |||
| 5a9aec80bd | |||
| 6616526279 | |||
| 6e00de58b9 | |||
| 0ec404bbec | |||
| 506aaf68ca | |||
| 9fa6b661eb | |||
| d1adccba00 | |||
| 9e30250446 | |||
| 3e7d657e2e | |||
| 7484d8441b | |||
| 682afce05f | |||
| 21b27e2f3b | |||
| 69cd9706cf | |||
| 98075fa2cf | |||
| 782f70fb49 | |||
| 52ab27e60f | |||
| 61e7ebeabd | |||
| 3a8121c306 | |||
| 209a95879f | |||
| 4f829d9908 | |||
| ac5345f528 | |||
| 1142481d89 | |||
| b4690f082f | |||
| 81a98ea938 | |||
| 9b387da77a | |||
| d0724c7d06 | |||
| 1414a3611b | |||
| a553c17c43 | |||
| 0be3fac6ab | |||
| 944e70221e | |||
| 21f13c4750 | |||
| be85ddd159 | |||
| 77c538ced9 | |||
| ee55680b03 | |||
| 0728239915 | |||
| 77016e6f0b | |||
| ce39aa5101 | |||
| f32196ce1b | |||
| 6b24e187a5 | |||
| 129d25df0e | |||
| fa31bd0223 | |||
| 21209b384d | |||
| 1a9c95871f | |||
| dc4d583121 | |||
| ed39f0288f | |||
| 3830706eb1 | |||
| f7ae62ade2 | |||
| 38ffbc27b7 | |||
| 8cebccf250 | |||
| 17aac0b552 | |||
| c281a329a4 | |||
| ca472716db | |||
| 3772c10b31 | |||
| 242be2fa60 | |||
| ffa4f29200 | |||
| 40a691b098 | |||
| 487ce3aeb4 | |||
| 6c0f10ae45 | |||
| 436b26c91c | |||
| f7bac26aed | |||
| a31c049b51 |
+10
-71
@@ -1,78 +1,17 @@
|
|||||||
version: 2.1
|
version: 2.1
|
||||||
|
|
||||||
orbs:
|
# Define the jobs we want to run for this project
|
||||||
python: circleci/python@1.3.2
|
|
||||||
codecov: codecov/codecov@3.2.2
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
build:
|
||||||
docker:
|
docker:
|
||||||
- image: "cimg/python:<<parameters.tag>>"
|
- image: cimg/base:2023.03
|
||||||
- image: 'cimg/node:14.18'
|
|
||||||
- image: 'circleci/redis:6'
|
|
||||||
- image: 'cimg/postgres:12.8'
|
|
||||||
environment:
|
|
||||||
POSTGRES_DB: speckle2_test
|
|
||||||
POSTGRES_PASSWORD: speckle
|
|
||||||
POSTGRES_USER: speckle
|
|
||||||
- image: "speckle/speckle-server"
|
|
||||||
command: ["bash", "-c", "/wait && node bin/www"]
|
|
||||||
environment:
|
|
||||||
POSTGRES_URL: "localhost"
|
|
||||||
POSTGRES_USER: "speckle"
|
|
||||||
POSTGRES_PASSWORD: "speckle"
|
|
||||||
POSTGRES_DB: "speckle2_test"
|
|
||||||
REDIS_URL: "redis://localhost"
|
|
||||||
SESSION_SECRET: "keyboard cat"
|
|
||||||
STRATEGY_LOCAL: "true"
|
|
||||||
CANONICAL_URL: "http://localhost:3000"
|
|
||||||
WAIT_HOSTS: localhost:5432, localhost:6379
|
|
||||||
parameters:
|
|
||||||
tag:
|
|
||||||
default: "3.8"
|
|
||||||
type: string
|
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- run: echo "so long and thanks for all the fish"
|
||||||
- run: python --version
|
|
||||||
- run:
|
|
||||||
command: python -m pip install --upgrade pip
|
|
||||||
name: upgrade pip
|
|
||||||
- python/install-packages:
|
|
||||||
pkg-manager: poetry
|
|
||||||
- run: poetry run pytest --cov --cov-report xml:reports/coverage.xml --junitxml=reports/test-results.xml
|
|
||||||
|
|
||||||
- store_test_results:
|
|
||||||
path: reports
|
|
||||||
|
|
||||||
- store_artifacts:
|
|
||||||
path: reports
|
|
||||||
|
|
||||||
- codecov/upload
|
|
||||||
|
|
||||||
deploy:
|
|
||||||
docker:
|
|
||||||
- image: "circleci/python:3.8"
|
|
||||||
steps:
|
|
||||||
- checkout
|
|
||||||
- run: python patch_version.py $CIRCLE_TAG
|
|
||||||
- run: poetry build
|
|
||||||
- run: poetry publish -u specklesystems -p $PYPI_PASSWORD
|
|
||||||
|
|
||||||
|
# Orchestrate our job run sequence
|
||||||
workflows:
|
workflows:
|
||||||
main:
|
build_and_test:
|
||||||
jobs:
|
when:
|
||||||
- test:
|
false
|
||||||
matrix:
|
jobs:
|
||||||
parameters:
|
- build
|
||||||
tag: ["3.6", "3.7", "3.8", "3.9"]
|
|
||||||
filters:
|
|
||||||
tags:
|
|
||||||
only: /.*/
|
|
||||||
- deploy:
|
|
||||||
requires:
|
|
||||||
- test
|
|
||||||
filters:
|
|
||||||
tags:
|
|
||||||
only: /[0-9]+(\.[0-9]+)*/
|
|
||||||
branches:
|
|
||||||
ignore: /.*/ # For testing only! /ci\/.*/
|
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
* text=auto eol=lf
|
||||||
|
*.{cmd,[cC][mM][dD]} text eol=crlf
|
||||||
|
*.{bat,[bB][aA][tT]} text eol=crlf
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
---
|
|
||||||
name: New issue
|
|
||||||
about: Create a report to help us improve
|
|
||||||
title:
|
|
||||||
labels:
|
|
||||||
assignees:
|
|
||||||
---
|
|
||||||
|
|
||||||
If it's your first time here - or you forgot about them - make sure you read the [contribution guidelines](CONTRIBUTING.md), and then feel free to delete this line!
|
|
||||||
|
|
||||||
### Expected vs. Actual Behavior
|
|
||||||
|
|
||||||
Describe the problem here.
|
|
||||||
|
|
||||||
### Reproduction Steps & System Config (win, osx, web, etc.)
|
|
||||||
|
|
||||||
Let us know how we can reproduce this, and attach relevant files (if any).
|
|
||||||
|
|
||||||
### Proposed Solution (if any)
|
|
||||||
|
|
||||||
Let us know what how you would solve this.
|
|
||||||
|
|
||||||
#### Optional: Affected Projects
|
|
||||||
|
|
||||||
Does this issue propagate to other dependencies or dependents? If so, list them here!
|
|
||||||
@@ -0,0 +1,113 @@
|
|||||||
|
---
|
||||||
|
name: Bug report
|
||||||
|
about: Help improve Speckle!
|
||||||
|
title: ''
|
||||||
|
labels: bug
|
||||||
|
assignees: ''
|
||||||
|
---
|
||||||
|
|
||||||
|
<!---
|
||||||
|
|
||||||
|
Provide a short summary in the Title above. Examples of good Issue titles:
|
||||||
|
|
||||||
|
* "Bug: Error from server when reticulating splines"
|
||||||
|
* "Bug: Revit crashes when installing connector"
|
||||||
|
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Prerequisites
|
||||||
|
|
||||||
|
<!---
|
||||||
|
|
||||||
|
Please answer the following questions before submitting an issue.
|
||||||
|
|
||||||
|
-->
|
||||||
|
|
||||||
|
- [ ] I read the [contribution guidelines](https://github.com/specklesystems/speckle-server/blob/main/CONTRIBUTING.md)
|
||||||
|
- [ ] I checked the [documentation](https://speckle.guide/) and found no answer.
|
||||||
|
- [ ] I checked [existing issues](../issues?q=is%3Aissue) and found no similar issue. <!-- If you do find an existing issue, please show your support by liking it :+1: instead of creating a new issue -->
|
||||||
|
- [ ] I checked the [community forum](https://speckle.community/) for related discussions and found no answer.
|
||||||
|
- [ ] I'm reporting the issue to the correct repository (see also [speckle-server](https://github.com/specklesystems/speckle-server), [speckle-sharp](https://github.com/specklesystems/speckle-sharp), [specklepy](https://github.com/specklesystems/specklepy), [speckle-docs](https://github.com/specklesystems/speckle-docs), and [others](https://github.com/orgs/specklesystems/repositories))
|
||||||
|
|
||||||
|
## What package are you referring to?
|
||||||
|
|
||||||
|
<!---
|
||||||
|
Is it related to the server (backend) only, or does this bug relate to the frontend, viewer, objectloader or any other package?
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Describe the bug
|
||||||
|
|
||||||
|
<!---
|
||||||
|
A clear and concise description of what the bug is.
|
||||||
|
-->
|
||||||
|
|
||||||
|
## To Reproduce
|
||||||
|
|
||||||
|
<!---
|
||||||
|
Steps to reproduce the behavior:
|
||||||
|
|
||||||
|
1. Go to '...'
|
||||||
|
2. Click on '....'
|
||||||
|
3. Scroll down to '....'
|
||||||
|
4. See error
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Expected behavior
|
||||||
|
|
||||||
|
<!---
|
||||||
|
A clear and concise description of what you expected to happen.
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Screenshots
|
||||||
|
|
||||||
|
<!---
|
||||||
|
If applicable, add screenshots to help explain your problem.
|
||||||
|
-->
|
||||||
|
|
||||||
|
## System Info
|
||||||
|
|
||||||
|
If applicable, please fill in the below details - they help a lot!
|
||||||
|
|
||||||
|
### Desktop (please complete the following information):
|
||||||
|
|
||||||
|
- OS: [e.g. iOS]
|
||||||
|
- Browser [e.g. chrome, safari]
|
||||||
|
- Version [e.g. 22]
|
||||||
|
|
||||||
|
### Smartphone (please complete the following information):
|
||||||
|
|
||||||
|
- Device: [e.g. iPhone6]
|
||||||
|
- OS: [e.g. iOS8.1]
|
||||||
|
- Browser [e.g. stock browser, safari]
|
||||||
|
- Version [e.g. 22]
|
||||||
|
|
||||||
|
## Failure Logs
|
||||||
|
|
||||||
|
<!---
|
||||||
|
Please include any relevant log snippets or files here, or upload as a file.
|
||||||
|
|
||||||
|
If including inline, please use markdown code block syntax. https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/creating-and-highlighting-code-blocks
|
||||||
|
For example:
|
||||||
|
|
||||||
|
```
|
||||||
|
your log output here
|
||||||
|
```
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Additional context
|
||||||
|
|
||||||
|
<!---
|
||||||
|
Add any other context about the problem here.
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Proposed Solution (if any)
|
||||||
|
|
||||||
|
<!---
|
||||||
|
Let us know what how you would solve this.
|
||||||
|
-->
|
||||||
|
|
||||||
|
#### Optional: Affected Projects
|
||||||
|
|
||||||
|
<!---
|
||||||
|
Does this issue propagate to other dependencies or dependents? If so, list them here with links!
|
||||||
|
-->
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
---
|
||||||
|
name: Feature request
|
||||||
|
about: Suggest an idea for Speckle!
|
||||||
|
title: ''
|
||||||
|
labels: enhancement, question
|
||||||
|
assignees: ''
|
||||||
|
---
|
||||||
|
|
||||||
|
<!---
|
||||||
|
|
||||||
|
Provide a short summary in the Title above. Examples of good Issue titles:
|
||||||
|
|
||||||
|
* "Enhancement: Connector for Minecraft"
|
||||||
|
* "Enhancement: Web viewer should support tesseracts"
|
||||||
|
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Prerequisites
|
||||||
|
|
||||||
|
<!---
|
||||||
|
|
||||||
|
Please answer the following questions before submitting an issue.
|
||||||
|
|
||||||
|
-->
|
||||||
|
|
||||||
|
- [ ] I read the [contribution guidelines](https://github.com/specklesystems/speckle-server/blob/main/CONTRIBUTING.md)
|
||||||
|
- [ ] I checked the [documentation](https://speckle.guide/) and found no answer.
|
||||||
|
- [ ] I checked [existing issues](../issues?q=is%3Aissue) and found no similar issue. <!-- If you do find an existing issue, please show your support by liking it :+1: instead of creating a new issue -->
|
||||||
|
- [ ] I checked the [community forum](https://speckle.community/) for related discussions and found no answer.
|
||||||
|
- [ ] I'm requesting the feature to the correct repository (see also [speckle-server](https://github.com/specklesystems/speckle-server), [speckle-sharp](https://github.com/specklesystems/speckle-sharp), [specklepy](https://github.com/specklesystems/specklepy), [speckle-docs](https://github.com/specklesystems/speckle-docs), and [others](https://github.com/orgs/specklesystems/repositories))
|
||||||
|
|
||||||
|
## What package are you referring to?
|
||||||
|
|
||||||
|
<!---
|
||||||
|
Is it related to the server (backend) only, or does this feature request relate to the frontend, viewer, objectloader or any other package?
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Is your feature request related to a problem? Please describe.
|
||||||
|
|
||||||
|
<!---
|
||||||
|
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Describe the solution you'd like
|
||||||
|
|
||||||
|
<!---
|
||||||
|
A clear and concise description of what you want to happen.
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Describe alternatives you've considered
|
||||||
|
|
||||||
|
<!---
|
||||||
|
A clear and concise description of any alternative solutions or features you've considered.
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Additional context
|
||||||
|
|
||||||
|
<!---
|
||||||
|
Add any other context or screenshots about the feature request here.
|
||||||
|
|
||||||
|
Have you seen this feature implemented in any other software? Can you provide screenshots or links to video or documentation?
|
||||||
|
What works well about these existing features in other software? What doesn't work well?
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Related issues or community discussions
|
||||||
|
|
||||||
|
<!---
|
||||||
|
Is this feature request related to (but sufficiently distinct from) any existing issues?
|
||||||
|
Does this feature request require other features to be available beforehand?
|
||||||
|
Has this feature been discussed in the community forum, please link here? https://speckle.community/
|
||||||
|
-->
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
Description of PR...
|
|
||||||
|
|
||||||
## Changes
|
|
||||||
|
|
||||||
- Item 1
|
|
||||||
- Item 2
|
|
||||||
|
|
||||||
## Checklist
|
|
||||||
|
|
||||||
- [ ] Unit tests
|
|
||||||
- [ ] Documentation
|
|
||||||
|
|
||||||
## References
|
|
||||||
|
|
||||||
(optional)
|
|
||||||
|
|
||||||
Include **important** links regarding the implementation of this PR.
|
|
||||||
This usually includes and RFC or an aggregation of issues and/or individual conversations
|
|
||||||
that helped put this solution together. This helps ensure there is a good aggregation
|
|
||||||
of resources regarding the implementation.
|
|
||||||
|
|
||||||
```text
|
|
||||||
Fixes #85, Fixes #22, Fixes username/repo#123
|
|
||||||
Connects #123
|
|
||||||
```
|
|
||||||
@@ -0,0 +1,102 @@
|
|||||||
|
<!---
|
||||||
|
|
||||||
|
Provide a short summary in the Title above. Examples of good PR titles:
|
||||||
|
|
||||||
|
* "Feature: adds metrics to component"
|
||||||
|
|
||||||
|
* "Fix: resolves duplication in comment thread"
|
||||||
|
|
||||||
|
* "Update: apollo v2.34.0"
|
||||||
|
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Description & motivation
|
||||||
|
|
||||||
|
<!---
|
||||||
|
|
||||||
|
Describe your changes, and why you're making them. What benefit will this have to others?
|
||||||
|
|
||||||
|
Is this linked to an open Github issue, a thread in Speckle community,
|
||||||
|
or another pull request? Link it here.
|
||||||
|
|
||||||
|
If it is related to a Github issue, and resolves it, please link to the issue number, e.g.:
|
||||||
|
Fixes #85, Fixes #22, Fixes username/repo#123
|
||||||
|
Connects #123
|
||||||
|
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Changes:
|
||||||
|
|
||||||
|
<!---
|
||||||
|
|
||||||
|
- Item 1
|
||||||
|
- Item 2
|
||||||
|
|
||||||
|
-->
|
||||||
|
|
||||||
|
## To-do before merge:
|
||||||
|
|
||||||
|
<!---
|
||||||
|
|
||||||
|
(Optional -- remove this section if not needed)
|
||||||
|
|
||||||
|
Include any notes about things that need to happen before this PR is merged, e.g.:
|
||||||
|
|
||||||
|
- [ ] Change the base branch
|
||||||
|
|
||||||
|
- [ ] Ensure PR #56 is merged
|
||||||
|
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Screenshots:
|
||||||
|
|
||||||
|
<!---
|
||||||
|
|
||||||
|
Include a screenshot the before and after. This can be a screenshot of a plugin, web frontend, or output in a terminal.
|
||||||
|
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Validation of changes:
|
||||||
|
|
||||||
|
<!---
|
||||||
|
|
||||||
|
Describe what tests have been added or amended, and why these demonstrate it works and will prevent this feature being accidentally broken by future changes.
|
||||||
|
|
||||||
|
-->
|
||||||
|
|
||||||
|
## Checklist:
|
||||||
|
|
||||||
|
<!---
|
||||||
|
|
||||||
|
This checklist is mostly useful as a reminder of small things that can easily be
|
||||||
|
|
||||||
|
forgotten – it is meant as a helpful tool rather than hoops to jump through.
|
||||||
|
|
||||||
|
Put an `x` between the square brackets, e.g. [x], for all the items that apply,
|
||||||
|
|
||||||
|
make notes next to any that haven't been addressed, and remove any items that are not relevant to this PR.
|
||||||
|
|
||||||
|
-->
|
||||||
|
|
||||||
|
- [ ] My pull request follows the guidelines in the [Contributing guide](https://github.com/specklesystems/speckle-server/blob/main/CONTRIBUTING.md)?
|
||||||
|
- [ ] My pull request does not duplicate any other open [Pull Requests](../../pulls) for the same update/change?
|
||||||
|
- [ ] My commits are related to the pull request and do not amend unrelated code or documentation.
|
||||||
|
- [ ] My code follows a similar style to existing code.
|
||||||
|
- [ ] I have added appropriate tests.
|
||||||
|
- [ ] I have updated or added relevant documentation.
|
||||||
|
|
||||||
|
## References
|
||||||
|
|
||||||
|
<!---
|
||||||
|
|
||||||
|
(Optional -- remove this section if not needed )
|
||||||
|
|
||||||
|
Include **important** links regarding the implementation of this PR.
|
||||||
|
|
||||||
|
This usually includes a RFC or an aggregation of issues and/or individual conversations
|
||||||
|
|
||||||
|
that helped put this solution together. This helps ensure we retain and share knowledge
|
||||||
|
|
||||||
|
regarding the implementation, and may help others understand motivation and design decisions etc..
|
||||||
|
|
||||||
|
-->
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
name: Update issue Status
|
|
||||||
|
|
||||||
on:
|
|
||||||
issues:
|
|
||||||
types: [closed]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
update_issue:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Get project data
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
|
|
||||||
ORGANIZATION: specklesystems
|
|
||||||
PROJECT_NUMBER: 9
|
|
||||||
run: |
|
|
||||||
gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
|
|
||||||
query($org: String!, $number: Int!) {
|
|
||||||
organization(login: $org){
|
|
||||||
projectNext(number: $number) {
|
|
||||||
id
|
|
||||||
fields(first:20) {
|
|
||||||
nodes {
|
|
||||||
id
|
|
||||||
name
|
|
||||||
settings
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
|
|
||||||
|
|
||||||
echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
|
|
||||||
echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
|
|
||||||
|
|
||||||
echo "$PROJECT_ID"
|
|
||||||
echo "$STATUS_FIELD_ID"
|
|
||||||
|
|
||||||
echo 'DONE_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .settings | fromjson | .options[] | select(.name== "Done") | .id' project_data.json) >> $GITHUB_ENV
|
|
||||||
echo "$DONE_ID"
|
|
||||||
|
|
||||||
- name: Add Issue to project #it's already in the project, but we do this to get its node id!
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
|
|
||||||
ISSUE_ID: ${{ github.event.issue.node_id }}
|
|
||||||
run: |
|
|
||||||
item_id="$( gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
|
|
||||||
mutation($project:ID!, $id:ID!) {
|
|
||||||
addProjectNextItem(input: {projectId: $project, contentId: $id}) {
|
|
||||||
projectNextItem {
|
|
||||||
id
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}' -f project=$PROJECT_ID -f id=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
|
|
||||||
|
|
||||||
echo 'ITEM_ID='$item_id >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Update Status
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
|
|
||||||
ISSUE_ID: ${{ github.event.issue.node_id }}
|
|
||||||
run: |
|
|
||||||
gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
|
|
||||||
mutation($project:ID!, $status:ID!, $id:ID!, $value:String!) {
|
|
||||||
set_status: updateProjectNextItemField(
|
|
||||||
input: {
|
|
||||||
projectId: $project
|
|
||||||
itemId: $id
|
|
||||||
fieldId: $status
|
|
||||||
value: $value
|
|
||||||
}
|
|
||||||
) {
|
|
||||||
projectNextItem {
|
|
||||||
id
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}' -f project=$PROJECT_ID -f status=$STATUS_FIELD_ID -f id=$ITEM_ID -f value=${{ env.DONE_ID }}
|
|
||||||
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
name: Move new issues into Project
|
|
||||||
|
|
||||||
on:
|
|
||||||
issues:
|
|
||||||
types: [opened]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
track_issue:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Get project data
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
|
|
||||||
ORGANIZATION: specklesystems
|
|
||||||
PROJECT_NUMBER: 9
|
|
||||||
run: |
|
|
||||||
gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
|
|
||||||
query($org: String!, $number: Int!) {
|
|
||||||
organization(login: $org){
|
|
||||||
projectNext(number: $number) {
|
|
||||||
id
|
|
||||||
fields(first:20) {
|
|
||||||
nodes {
|
|
||||||
id
|
|
||||||
name
|
|
||||||
settings
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
|
|
||||||
|
|
||||||
echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
|
|
||||||
echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Add Issue to project
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
|
|
||||||
ISSUE_ID: ${{ github.event.issue.node_id }}
|
|
||||||
run: |
|
|
||||||
item_id="$( gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
|
|
||||||
mutation($project:ID!, $id:ID!) {
|
|
||||||
addProjectNextItem(input: {projectId: $project, contentId: $id}) {
|
|
||||||
projectNextItem {
|
|
||||||
id
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}' -f project=$PROJECT_ID -f id=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
|
|
||||||
|
|
||||||
echo 'ITEM_ID='$item_id >> $GITHUB_ENV
|
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
name: "Specklepy test"
|
||||||
|
on:
|
||||||
|
workflow_call:
|
||||||
|
secrets:
|
||||||
|
CODECOV_TOKEN:
|
||||||
|
required: true
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- "main"
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
test:
|
||||||
|
name: test
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
python-version:
|
||||||
|
- "3.10"
|
||||||
|
- "3.11"
|
||||||
|
- "3.12"
|
||||||
|
- "3.13"
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Install uv and set the python version
|
||||||
|
uses: astral-sh/setup-uv@v5
|
||||||
|
with:
|
||||||
|
python-version: ${{ matrix.python-version }}
|
||||||
|
enable-cache: true
|
||||||
|
cache-dependency-glob: "uv.lock"
|
||||||
|
|
||||||
|
- name: Install the project
|
||||||
|
run: uv sync --all-extras --dev
|
||||||
|
|
||||||
|
- uses: actions/cache@v3
|
||||||
|
with:
|
||||||
|
path: ~/.cache/pre-commit/
|
||||||
|
key: ${{ hashFiles('.pre-commit-config.yaml') }}
|
||||||
|
|
||||||
|
- name: Run pre-commit
|
||||||
|
run: uv run pre-commit run --all-files
|
||||||
|
|
||||||
|
- name: Run Speckle Server
|
||||||
|
run: docker compose up --detach --wait
|
||||||
|
|
||||||
|
- name: Run tests
|
||||||
|
run: uv run pytest --cov --cov-report xml:reports/coverage.xml --junitxml=reports/test-results.xml
|
||||||
|
|
||||||
|
- uses: codecov/codecov-action@v5
|
||||||
|
if: matrix.python-version == 3.12
|
||||||
|
with:
|
||||||
|
fail_ci_if_error: true # optional (default = false)
|
||||||
|
files: ./reports/test-results.xml # optional
|
||||||
|
token: ${{ secrets.CODECOV_TOKEN }}
|
||||||
|
|
||||||
|
- name: Minimize uv cache
|
||||||
|
run: uv cache prune --ci
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
name: "Publish Python Package"
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- "main"
|
||||||
|
tags:
|
||||||
|
- "3.*.*"
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
test:
|
||||||
|
uses: "./.github/workflows/pr.yml"
|
||||||
|
secrets:
|
||||||
|
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
|
||||||
|
|
||||||
|
publish-package:
|
||||||
|
name: "Build and Publish Python Package"
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: test
|
||||||
|
|
||||||
|
# set the environment based on what triggered the workflow
|
||||||
|
environment:
|
||||||
|
name: ${{ github.ref_type == 'tag' && 'pypi' || 'testpypi' }}
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
id-token: write
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: "Install uv"
|
||||||
|
uses: astral-sh/setup-uv@v5
|
||||||
|
|
||||||
|
- name: "Checkout code"
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: "Build package artifacts"
|
||||||
|
run: uv build
|
||||||
|
|
||||||
|
# Logic for TestPyPI (on main branch push)
|
||||||
|
- name: "Publish to TestPyPI"
|
||||||
|
if: ${{ github.ref_type == 'branch' }}
|
||||||
|
run: uv publish --index test
|
||||||
|
|
||||||
|
- name: "Verify TestPyPI package installation"
|
||||||
|
if: ${{ github.ref_type == 'branch' }}
|
||||||
|
run: uv run --index test --with specklepy --no-project -- python -c "import specklepy"
|
||||||
|
|
||||||
|
# Logic for PyPI (on v3* tag creation)
|
||||||
|
- name: "Publish to PyPI"
|
||||||
|
if: ${{ github.ref_type == 'tag' }}
|
||||||
|
run: uv publish
|
||||||
|
|
||||||
|
- name: "Verify PyPI package installation"
|
||||||
|
if: ${{ github.ref_type == 'tag' }}
|
||||||
|
run: uv run --with specklepy --no-project -- python -c "import specklepy"
|
||||||
+3
-1
@@ -2,6 +2,8 @@
|
|||||||
.envrc
|
.envrc
|
||||||
reports/
|
reports/
|
||||||
|
|
||||||
|
.volumes/
|
||||||
|
|
||||||
# Byte-compiled / optimized / DLL files
|
# Byte-compiled / optimized / DLL files
|
||||||
__pycache__/
|
__pycache__/
|
||||||
*.py[cod]
|
*.py[cod]
|
||||||
@@ -112,4 +114,4 @@ venv.bak/
|
|||||||
|
|
||||||
# other
|
# other
|
||||||
scratch.py
|
scratch.py
|
||||||
settings.json
|
settings.json
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
repos:
|
||||||
|
- repo: local
|
||||||
|
hooks:
|
||||||
|
# Run the linter.
|
||||||
|
- id: ruff
|
||||||
|
name: ruff lint
|
||||||
|
entry: uv run ruff check --force-exclude
|
||||||
|
language: system
|
||||||
|
types_or: [python, pyi]
|
||||||
|
# Run the formatter.
|
||||||
|
- id: ruff-format
|
||||||
|
name: ruff format
|
||||||
|
entry: uv run ruff format --force-exclude
|
||||||
|
language: system
|
||||||
|
types_or: [python, pyi]
|
||||||
|
|
||||||
|
|
||||||
|
- repo: https://github.com/commitizen-tools/commitizen
|
||||||
|
hooks:
|
||||||
|
- id: commitizen
|
||||||
|
- id: commitizen-branch
|
||||||
|
stages:
|
||||||
|
- pre-push
|
||||||
|
rev: v3.13.0
|
||||||
|
|
||||||
|
|
||||||
|
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||||
|
rev: v5.0.0
|
||||||
|
hooks:
|
||||||
|
- id: end-of-file-fixer
|
||||||
|
- id: trailing-whitespace
|
||||||
Vendored
+6
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"recommendations": [
|
||||||
|
"ms-python.python",
|
||||||
|
"charliermarsh.ruff"
|
||||||
|
]
|
||||||
|
}
|
||||||
Vendored
+8
-5
@@ -6,17 +6,20 @@
|
|||||||
"configurations": [
|
"configurations": [
|
||||||
{
|
{
|
||||||
"name": "Python: Current File",
|
"name": "Python: Current File",
|
||||||
"type": "python",
|
"type": "debugpy",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"program": "${file}",
|
"program": "${file}",
|
||||||
"console": "integratedTerminal",
|
"console": "integratedTerminal",
|
||||||
"justMyCode": false
|
"justMyCode": false
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Python: Test debug config",
|
"name": "Pytest",
|
||||||
"type": "python",
|
"type": "debugpy",
|
||||||
"request": "test",
|
"request": "launch",
|
||||||
|
"module": "pytest",
|
||||||
|
"args": [],
|
||||||
"console": "integratedTerminal",
|
"console": "integratedTerminal",
|
||||||
|
"justMyCode": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,52 +2,26 @@
|
|||||||
<img src="https://user-images.githubusercontent.com/2679513/131189167-18ea5fe1-c578-47f6-9785-3748178e4312.png" width="150px"/><br/>
|
<img src="https://user-images.githubusercontent.com/2679513/131189167-18ea5fe1-c578-47f6-9785-3748178e4312.png" width="150px"/><br/>
|
||||||
Speckle | specklepy 🐍
|
Speckle | specklepy 🐍
|
||||||
</h1>
|
</h1>
|
||||||
|
|
||||||
|
<p align="center"><a href="https://twitter.com/SpeckleSystems"><img src="https://img.shields.io/twitter/follow/SpeckleSystems?style=social" alt="Twitter Follow"></a> <a href="https://speckle.community"><img src="https://img.shields.io/discourse/users?server=https%3A%2F%2Fspeckle.community&style=flat-square&logo=discourse&logoColor=white" alt="Community forum users"></a> <a href="https://speckle.systems"><img src="https://img.shields.io/badge/https://-speckle.systems-royalblue?style=flat-square" alt="website"></a> <a href="https://speckle.guide/dev/"><img src="https://img.shields.io/badge/docs-speckle.guide-orange?style=flat-square&logo=read-the-docs&logoColor=white" alt="docs"></a></p>
|
||||||
|
|
||||||
|
> Speckle is the first AEC data hub that connects with your favorite AEC tools. Speckle exists to overcome the challenges of working in a fragmented industry where communication, creative workflows, and the exchange of data are often hindered by siloed software and processes. It is here to make the industry better.
|
||||||
|
|
||||||
<h3 align="center">
|
<h3 align="center">
|
||||||
The Python SDK
|
The Python SDK
|
||||||
</h3>
|
</h3>
|
||||||
<p align="center"><b>Speckle</b> is the data infrastructure for the AEC industry.</p><br/>
|
|
||||||
|
|
||||||
<p align="center"><a href="https://twitter.com/SpeckleSystems"><img src="https://img.shields.io/twitter/follow/SpeckleSystems?style=social" alt="Twitter Follow"></a> <a href="https://speckle.community"><img src="https://img.shields.io/discourse/users?server=https%3A%2F%2Fspeckle.community&style=flat-square&logo=discourse&logoColor=white" alt="Community forum users"></a> <a href="https://speckle.systems"><img src="https://img.shields.io/badge/https://-speckle.systems-royalblue?style=flat-square" alt="website"></a> <a href="https://speckle.guide/dev/"><img src="https://img.shields.io/badge/docs-speckle.guide-orange?style=flat-square&logo=read-the-docs&logoColor=white" alt="docs"></a></p>
|
|
||||||
<p align="center"><a href="https://github.com/specklesystems/specklepy/"><img src="https://circleci.com/gh/specklesystems/specklepy.svg?style=svg&circle-token=76eabd350ea243575cbb258b746ed3f471f7ac29" alt="Speckle-Next"></a><a href="https://codecov.io/gh/specklesystems/specklepy">
|
|
||||||
<img src="https://codecov.io/gh/specklesystems/specklepy/branch/main/graph/badge.svg?token=8KQFL5N0YF"/>
|
|
||||||
</a> </p>
|
|
||||||
|
|
||||||
# About Speckle
|
|
||||||
|
|
||||||
What is Speckle? Check our 
|
|
||||||
|
|
||||||
### Features
|
|
||||||
|
|
||||||
- **Object-based:** say goodbye to files! Speckle is the first object based platform for the AEC industry
|
|
||||||
- **Version control:** Speckle is the Git & Hub for geometry and BIM data
|
|
||||||
- **Collaboration:** share your designs collaborate with others
|
|
||||||
- **3D Viewer:** see your CAD and BIM models online, share and embed them anywhere
|
|
||||||
- **Interoperability:** get your CAD and BIM models into other software without exporting or importing
|
|
||||||
- **Real time:** get real time updates and notifications and changes
|
|
||||||
- **GraphQL API:** get what you need anywhere you want it
|
|
||||||
- **Webhooks:** the base for a automation and next-gen pipelines
|
|
||||||
- **Built for developers:** we are building Speckle with developers in mind and got tools for every stack
|
|
||||||
- **Built for the AEC industry:** Speckle connectors are plugins for the most common software used in the industry such as Revit, Rhino, Grasshopper, AutoCAD, Civil 3D, Excel, Unreal Engine, Unity, QGIS, Blender and more!
|
|
||||||
|
|
||||||
### Try Speckle now!
|
|
||||||
|
|
||||||
Give Speckle a try in no time by:
|
|
||||||
|
|
||||||
- [](https://speckle.xyz) ⇒ creating an account at our public server
|
|
||||||
- [](https://marketplace.digitalocean.com/apps/speckle-server?refcode=947a2b5d7dc1) ⇒ deploying an instance in 1 click
|
|
||||||
|
|
||||||
### Resources
|
|
||||||
|
|
||||||
- [](https://speckle.community) for help, feature requests or just to hang with other speckle enthusiasts, check out our community forum!
|
|
||||||
- [](https://speckle.systems) our tutorials portal is full of resources to get you started using Speckle
|
|
||||||
- [](https://speckle.guide/dev/) reference on almost any end-user and developer functionality
|
|
||||||
|
|
||||||
|
<p align="center">
|
||||||
|
<a href="https://pypi.org/project/specklepy/"><img alt="PyPI - Version" src="https://img.shields.io/pypi/v/specklepy"></a>
|
||||||
|
<a href="https://codecov.io/gh/specklesystems/specklepy"><img src="https://codecov.io/gh/specklesystems/specklepy/branch/main/graph/badge.svg?token=8KQFL5N0YF" alt="Codecov"></a>
|
||||||
|
<a href="https://github.com/specklesystems/specklepy/blob/main/LICENSE"><img alt="License" src="https://img.shields.io/github/license/specklesystems/specklepy"></a>
|
||||||
|
</p>
|
||||||
|
|
||||||
# Repo structure
|
# Repo structure
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
Send and receive data from a Speckle Server with `operations`, interact with the Speckle API with the `SpeckleClient`, create and extend your own custom Speckle Objects with `Base`, and more!
|
Send and receive data from a Speckle Server with `operations`, interact with the Speckle API with the `SpeckleClient`, create and extend your own custom Speckle Objects with `Base`, and more!
|
||||||
|
|
||||||
Head to the [**📚 specklepy docs**](https://speckle.guide/dev/python.html) for more information and usage examples.
|
Head to the [**📚 specklepy docs**](https://speckle.guide/dev/python.html) for more information and usage examples.
|
||||||
|
|
||||||
@@ -55,26 +29,32 @@ Head to the [**📚 specklepy docs**](https://speckle.guide/dev/python.html) for
|
|||||||
|
|
||||||
### Installation
|
### Installation
|
||||||
|
|
||||||
This project uses python-poetry for dependency management, make sure you follow the official [docs](https://python-poetry.org/docs/#installation) to get poetry.
|
This project uses uv for dependency management, make sure you follow the official [docs](https://docs.astral.sh/uv/) to get it.
|
||||||
|
|
||||||
To bootstrap the project environment run `$ poetry install`. This will create a new virtual-env for the project and install both the package and dev dependencies.
|
To create a new virtual environment with uv run `$ uv venv` and follow the instructions on the screen to activate the virtual environment.
|
||||||
|
To bootstrap the project environment run `$ uv sync`. This will install both the package and dev dependencies.
|
||||||
|
|
||||||
If this is your first time using poetry and you're used to creating your venvs within the project directory, run `poetry config virtualenvs.in-project true` to configure poetry to do the same.
|
To execute any python script run `$ uv run python my_script.py`
|
||||||
|
|
||||||
To execute any python script run `$ poetry run python my_script.py`
|
> Alternatively you may roll your own virtual-env with either venv, virtualenv, pyenv-virtualenv etc. Uv will play along an recognize if it is invoked from inside a virtual environment.
|
||||||
|
|
||||||
> Alternatively you may roll your own virtual-env with either venv, virtualenv, pyenv-virtualenv etc. Poetry will play along an recognize if it is invoked from inside a virtual environment.
|
### Style guide
|
||||||
|
|
||||||
|
All our repo wide styling linting and other rules are checked and enforced by `pre-commit`, which is included in the dev dependencies.
|
||||||
|
It is recommended to set up `pre-commit` after installing the dependencies by running `$ pre-commit install`.
|
||||||
|
Commiting code that doesn't adhere to the given rules, will fail the checks in our CI system.
|
||||||
|
|
||||||
### Local Data Paths
|
### Local Data Paths
|
||||||
|
|
||||||
It may be helpful to know where the local accounts and object cache dbs are stored. Depending on on your OS, you can find the dbs at:
|
It may be helpful to know where the local accounts and object cache dbs are stored. Depending on on your OS, you can find the dbs at:
|
||||||
|
|
||||||
- Windows: `APPDATA` or `<USER>\AppData\Roaming\Speckle`
|
- Windows: `APPDATA` or `<USER>\AppData\Roaming\Speckle`
|
||||||
- Linux: `$XDG_DATA_HOME` or by default `~/.local/share/Speckle`
|
- Linux: `$XDG_DATA_HOME` or by default `~/.local/share/Speckle`
|
||||||
- Mac: `~/.config/Speckle`
|
- Mac: `~/.config/Speckle`
|
||||||
|
|
||||||
## Contributing
|
## Contributing
|
||||||
|
|
||||||
Please make sure you read the [contribution guidelines](.github/CONTRIBUTING.md) for an overview of the best practices we try to follow.
|
Please make sure you read the [contribution guidelines](.github/CONTRIBUTING.md) and [code of conduct](.github/CODE_OF_CONDUCT.md) for an overview of the practices we try to follow.
|
||||||
|
|
||||||
## Community
|
## Community
|
||||||
|
|
||||||
@@ -82,7 +62,7 @@ The Speckle Community hangs out on [the forum](https://discourse.speckle.works),
|
|||||||
|
|
||||||
## Security
|
## Security
|
||||||
|
|
||||||
For any security vulnerabilities or concerns, please contact us directly at security[at]speckle.systems.
|
For any security vulnerabilities or concerns, please contact us directly at security[at]speckle.systems.
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
|
|||||||
+12
@@ -0,0 +1,12 @@
|
|||||||
|
# Security Policy
|
||||||
|
|
||||||
|
## Supported Versions
|
||||||
|
|
||||||
|
| Version | Supported |
|
||||||
|
| ------- | ------------------ |
|
||||||
|
| 2.2.+ | :white_check_mark: |
|
||||||
|
| < 2.2 | :x: |
|
||||||
|
|
||||||
|
## Reporting a Vulnerability
|
||||||
|
|
||||||
|
Hi! If you've found something off, we'd be more than happy if you would report it via security@speckle.systems. We will work together with you to correctly identify the cause and implement a fix. Thanks for helping make Speckle safer!
|
||||||
@@ -0,0 +1,118 @@
|
|||||||
|
version: "3.9"
|
||||||
|
name: "speckle-server"
|
||||||
|
|
||||||
|
services:
|
||||||
|
####
|
||||||
|
# Speckle Server dependencies
|
||||||
|
#######
|
||||||
|
postgres:
|
||||||
|
image: "postgres:16.4-alpine3.20@sha256:d898b0b78a2627cb4ee63464a14efc9d296884f1b28c841b0ab7d7c42f1fffdf"
|
||||||
|
restart: always
|
||||||
|
environment:
|
||||||
|
POSTGRES_DB: speckle
|
||||||
|
POSTGRES_USER: speckle
|
||||||
|
POSTGRES_PASSWORD: speckle
|
||||||
|
volumes:
|
||||||
|
- ./.volumes/postgres-data:/var/lib/postgresql/data/
|
||||||
|
healthcheck:
|
||||||
|
# the -U user has to match the POSTGRES_USER value
|
||||||
|
test: ["CMD-SHELL", "pg_isready -U speckle"]
|
||||||
|
interval: 5s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 30
|
||||||
|
|
||||||
|
redis:
|
||||||
|
image: "redis:6.0-alpine"
|
||||||
|
restart: always
|
||||||
|
volumes:
|
||||||
|
- ./.volumes/redis-data:/data
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "redis-cli", "--raw", "incr", "ping"]
|
||||||
|
interval: 5s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 30
|
||||||
|
|
||||||
|
minio:
|
||||||
|
image: "minio/minio:RELEASE.2023-10-25T06-33-25Z"
|
||||||
|
command: server /data --console-address ":9001"
|
||||||
|
restart: always
|
||||||
|
volumes:
|
||||||
|
- ./.volumes/minio-data:/data
|
||||||
|
healthcheck:
|
||||||
|
test:
|
||||||
|
[
|
||||||
|
"CMD-SHELL",
|
||||||
|
"curl -s -o /dev/null http://127.0.0.1:9000/minio/index.html",
|
||||||
|
]
|
||||||
|
interval: 5s
|
||||||
|
timeout: 30s
|
||||||
|
retries: 30
|
||||||
|
start_period: 10s
|
||||||
|
ports:
|
||||||
|
- "0.0.0.0:9000:9000"
|
||||||
|
|
||||||
|
speckle-server:
|
||||||
|
image: speckle/speckle-server:latest
|
||||||
|
restart: always
|
||||||
|
healthcheck:
|
||||||
|
test:
|
||||||
|
- CMD
|
||||||
|
- /nodejs/bin/node
|
||||||
|
- -e
|
||||||
|
- "try { require('node:http').request({headers: {'Content-Type': 'application/json'}, port:3000, hostname:'127.0.0.1', path:'/readiness', method: 'GET', timeout: 2000 }, (res) => { body = ''; res.on('data', (chunk) => {body += chunk;}); res.on('end', () => {process.exit(Number(res.statusCode != 200 || body.toLowerCase().includes('error')));}); }).end(); } catch { process.exit(1); }"
|
||||||
|
interval: 10s
|
||||||
|
timeout: 10s
|
||||||
|
retries: 3
|
||||||
|
start_period: 90s
|
||||||
|
ports:
|
||||||
|
- "0.0.0.0:3000:3000"
|
||||||
|
depends_on:
|
||||||
|
postgres:
|
||||||
|
condition: service_healthy
|
||||||
|
redis:
|
||||||
|
condition: service_healthy
|
||||||
|
minio:
|
||||||
|
condition: service_healthy
|
||||||
|
environment:
|
||||||
|
# TODO: Change this to the URL of the speckle server, as accessed from the network
|
||||||
|
CANONICAL_URL: "http://127.0.0.1:8080"
|
||||||
|
SPECKLE_AUTOMATE_URL: "http://127.0.0.1:3030"
|
||||||
|
FRONTEND_ORIGIN: "http://127.0.0.1:8081"
|
||||||
|
|
||||||
|
# TODO: Change thvolumes:
|
||||||
|
REDIS_URL: "redis://redis"
|
||||||
|
|
||||||
|
S3_ENDPOINT: "http://minio:9000"
|
||||||
|
S3_PUBLIC_ENDPOINT: "http://127.0.0.1:9000"
|
||||||
|
S3_ACCESS_KEY: "minioadmin"
|
||||||
|
S3_SECRET_KEY: "minioadmin"
|
||||||
|
S3_BUCKET: "speckle-server"
|
||||||
|
S3_CREATE_BUCKET: "true"
|
||||||
|
|
||||||
|
FILE_SIZE_LIMIT_MB: 100
|
||||||
|
MAX_PROJECT_MODELS_PER_PAGE: 500
|
||||||
|
|
||||||
|
# TODO: Change this to a unique secret for this server
|
||||||
|
SESSION_SECRET: "TODO:ReplaceWithLongString"
|
||||||
|
|
||||||
|
STRATEGY_LOCAL: "true"
|
||||||
|
DEBUG: "speckle:*"
|
||||||
|
|
||||||
|
POSTGRES_URL: "postgres"
|
||||||
|
POSTGRES_USER: "speckle"
|
||||||
|
POSTGRES_PASSWORD: "speckle"
|
||||||
|
POSTGRES_DB: "speckle"
|
||||||
|
ENABLE_MP: "false"
|
||||||
|
|
||||||
|
FF_NEXT_GEN_FILE_IMPORTER_ENABLED: "true"
|
||||||
|
FF_LARGE_FILE_IMPORTS_ENABLED: "true"
|
||||||
|
FF_BACKGROUND_JOBS_ENABLED: "true"
|
||||||
|
|
||||||
|
networks:
|
||||||
|
default:
|
||||||
|
name: speckle-server
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
postgres-data:
|
||||||
|
redis-data:
|
||||||
|
minio-data:
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
import os
|
||||||
|
import random
|
||||||
|
import string
|
||||||
|
import time
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import List
|
||||||
|
|
||||||
|
from specklepy.api import operations
|
||||||
|
from specklepy.objects import Base
|
||||||
|
from specklepy.transports.sqlite import SQLiteTransport
|
||||||
|
|
||||||
|
|
||||||
|
class Sub(Base):
|
||||||
|
bar: List[str]
|
||||||
|
|
||||||
|
|
||||||
|
def random_string():
|
||||||
|
letters = string.ascii_lowercase
|
||||||
|
return "".join(random.choice(letters) for _ in range(10))
|
||||||
|
|
||||||
|
|
||||||
|
BASE_PATH = SQLiteTransport.get_base_path("Speckle")
|
||||||
|
|
||||||
|
|
||||||
|
def clean_db():
|
||||||
|
os.remove(Path(BASE_PATH, "Objects.db"))
|
||||||
|
|
||||||
|
|
||||||
|
def one_pass(clean: bool, randomize: bool, child_count: int):
|
||||||
|
foo = Base()
|
||||||
|
for i in range(child_count):
|
||||||
|
stuff = random_string() if randomize else "stuff"
|
||||||
|
foo[f"@child_{i}"] = Sub(bar=["asdf", "bar", i, stuff])
|
||||||
|
|
||||||
|
if clean:
|
||||||
|
clean_db()
|
||||||
|
transport = SQLiteTransport()
|
||||||
|
start = time.time()
|
||||||
|
hash = operations.send(base=foo, transports=[transport])
|
||||||
|
send_time = time.time() - start
|
||||||
|
|
||||||
|
receive_start = time.time()
|
||||||
|
operations.receive(hash, transport)
|
||||||
|
receive_time = time.time() - receive_start
|
||||||
|
return send_time, receive_time
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
sample_size = 4
|
||||||
|
|
||||||
|
test_permutations = [
|
||||||
|
(True, True),
|
||||||
|
(False, False),
|
||||||
|
(False, True),
|
||||||
|
(True, False),
|
||||||
|
]
|
||||||
|
for clean, randomize in test_permutations:
|
||||||
|
print(f"CLEAN: {clean}, RANDOMIZE: {randomize}")
|
||||||
|
for child_count in [10, 100, 1000, 10000]:
|
||||||
|
print(f"\tCHILD COUNT: {child_count}")
|
||||||
|
for _ in range(sample_size):
|
||||||
|
send_time, receive_time = one_pass(clean, randomize, child_count)
|
||||||
|
print(f"\t\tSend: {send_time} Receive: {receive_time}")
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
from devtools import debug
|
||||||
|
|
||||||
|
from specklepy.api import operations
|
||||||
|
from specklepy.api.wrapper import StreamWrapper
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
stream_url = "https://latest.speckle.dev/streams/7d051a6449"
|
||||||
|
wrapper = StreamWrapper(stream_url)
|
||||||
|
|
||||||
|
transport = wrapper.get_transport()
|
||||||
|
|
||||||
|
rec = operations.receive("98396753f8bf7fe1cb60c5193e9f9d86", transport)
|
||||||
|
|
||||||
|
# hash = operations.send(base=foo, transports=[transport], use_default_cache=False)
|
||||||
|
debug(rec)
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
import random
|
||||||
|
import string
|
||||||
|
from typing import List
|
||||||
|
|
||||||
|
from specklepy.api import operations
|
||||||
|
from specklepy.api.wrapper import StreamWrapper
|
||||||
|
from specklepy.objects import Base
|
||||||
|
|
||||||
|
|
||||||
|
class Sub(Base):
|
||||||
|
bar: List[str]
|
||||||
|
|
||||||
|
|
||||||
|
def random_string():
|
||||||
|
letters = string.ascii_lowercase
|
||||||
|
return "".join(random.choice(letters) for _ in range(10))
|
||||||
|
|
||||||
|
|
||||||
|
def create_object(child_count: int) -> Base:
|
||||||
|
foo = Base()
|
||||||
|
for i in range(child_count):
|
||||||
|
stuff = random_string()
|
||||||
|
foo[f"@child_{i}"] = Sub(bar=["asdf", "bar", i, stuff])
|
||||||
|
return foo
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
stream_url = "http://hyperion:3000/streams/2372b54c35"
|
||||||
|
|
||||||
|
child_count = 10
|
||||||
|
foo = create_object(child_count)
|
||||||
|
|
||||||
|
wrapper = StreamWrapper(stream_url)
|
||||||
|
transport = wrapper.get_transport()
|
||||||
|
|
||||||
|
hash = operations.send(base=foo, transports=[transport], use_default_cache=False)
|
||||||
|
|
||||||
|
rec = operations.receive(hash, transport)
|
||||||
|
print(rec)
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
from devtools import debug
|
||||||
|
|
||||||
|
from specklepy.api import operations
|
||||||
|
from specklepy.objects_v2.geometry import Base
|
||||||
|
from specklepy.objects_v2.units import Units
|
||||||
|
|
||||||
|
dct = {
|
||||||
|
"id": "1234abcd",
|
||||||
|
"units": None,
|
||||||
|
"speckle_type": "Base",
|
||||||
|
"applicationId": None,
|
||||||
|
"totalChildrenCount": 0,
|
||||||
|
}
|
||||||
|
base = Base()
|
||||||
|
for prop, value in dct.items():
|
||||||
|
base.__setattr__(prop, value)
|
||||||
|
|
||||||
|
|
||||||
|
debug(base)
|
||||||
|
debug(base.units)
|
||||||
|
|
||||||
|
base.units = "m"
|
||||||
|
debug(base.units)
|
||||||
|
base.units = None
|
||||||
|
|
||||||
|
debug(base.units)
|
||||||
|
|
||||||
|
foo = operations.serialize(base)
|
||||||
|
|
||||||
|
base.units = 10
|
||||||
|
|
||||||
|
debug(base.units)
|
||||||
|
debug(foo)
|
||||||
|
|
||||||
|
base.units = Units.mm
|
||||||
|
debug(base.units)
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
"""This is an example showcasing the usage of speckle `Base` class."""
|
"""This is an example showcasing the usage of speckle `Base` class."""
|
||||||
|
|
||||||
# the speckle.objects module exposes all speckle provided classes
|
# the speckle.objects module exposes all speckle provided classes
|
||||||
from specklepy.objects import Base
|
|
||||||
from specklepy.api import operations
|
|
||||||
from devtools import debug
|
from devtools import debug
|
||||||
|
|
||||||
|
from specklepy.api import operations
|
||||||
|
from specklepy.objects import Base
|
||||||
|
|
||||||
|
|
||||||
class ExampleSub(Base):
|
class ExampleSub(Base):
|
||||||
"""
|
"""
|
||||||
@@ -50,10 +51,10 @@ if __name__ == "__main__":
|
|||||||
)
|
)
|
||||||
# support for dynamic attributes
|
# support for dynamic attributes
|
||||||
custom_sub.extra_extra = "what is this?"
|
custom_sub.extra_extra = "what is this?"
|
||||||
debug(custom_sub.json())
|
debug(custom_sub)
|
||||||
|
|
||||||
serialized = operations.serialize(custom_sub)
|
serialized = operations.serialize(custom_sub)
|
||||||
deserialized = operations.deserialize(serialized)
|
deserialized = operations.deserialize(serialized)
|
||||||
# the only difference should be between the two data is that the deserialized
|
# the only difference should be between the two data is that the deserialized
|
||||||
# instance id attribute is not None.
|
# instance id attribute is not None.
|
||||||
debug(deserialized.json())
|
debug(deserialized)
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
[tools]
|
||||||
|
python = "3.13.7"
|
||||||
|
|
||||||
|
[settings]
|
||||||
|
experimental = true
|
||||||
|
python.uv_venv_auto = true
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
import re
|
|
||||||
import sys
|
|
||||||
|
|
||||||
|
|
||||||
def patch(tag):
|
|
||||||
print(f"Patching version: {tag}")
|
|
||||||
|
|
||||||
with open("pyproject.toml", "r") as f:
|
|
||||||
lines = f.readlines()
|
|
||||||
|
|
||||||
if "version" not in lines[2]:
|
|
||||||
raise Exception(f"Invalid pyproject.toml. Could not patch version.")
|
|
||||||
|
|
||||||
lines[2] = f'version = "{tag}"\n'
|
|
||||||
with open("pyproject.toml", "w") as file:
|
|
||||||
file.writelines(lines)
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
if len(sys.argv) < 2:
|
|
||||||
return
|
|
||||||
|
|
||||||
tag = sys.argv[1]
|
|
||||||
if not re.match(r"[0-9]+(\.[0-9]+)*$", tag):
|
|
||||||
raise ValueError(f"Invalid tag provided: {tag}")
|
|
||||||
|
|
||||||
patch(tag)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
Generated
-1076
File diff suppressed because it is too large
Load Diff
+90
-44
@@ -1,50 +1,96 @@
|
|||||||
[tool.poetry]
|
[project]
|
||||||
|
dynamic = ["version"]
|
||||||
|
# version = "3.0.0a1"
|
||||||
name = "specklepy"
|
name = "specklepy"
|
||||||
version = "2.4.0"
|
description = "The Python SDK for Speckle"
|
||||||
description = "The Python SDK for Speckle 2.0"
|
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
authors = ["Speckle Systems <devops@speckle.systems>"]
|
authors = [{ name = "Speckle Systems", email = "devops@speckle.systems" }]
|
||||||
license = "Apache-2.0"
|
license = { text = "Apache-2.0" }
|
||||||
repository = "https://github.com/specklesystems/speckle-py"
|
requires-python = ">=3.10.0, <4.0"
|
||||||
|
dependencies = [
|
||||||
|
"appdirs>=1.4.4",
|
||||||
|
"attrs>=24.3.0",
|
||||||
|
"deprecated>=1.2.15",
|
||||||
|
"gql[requests,websockets]>=3.5.0",
|
||||||
|
"httpx>=0.28.1",
|
||||||
|
"pydantic>=2.10.5",
|
||||||
|
"pydantic-settings>=2.7.1",
|
||||||
|
"ujson>=5.10.0",
|
||||||
|
]
|
||||||
|
|
||||||
|
[project.optional-dependencies]
|
||||||
|
speckleifc = ["ifcopenshell>=0.8.3.post2"]
|
||||||
|
|
||||||
|
[dependency-groups]
|
||||||
|
dev = [
|
||||||
|
"commitizen>=4.1.0",
|
||||||
|
"devtools>=0.12.2",
|
||||||
|
"hatch>=1.14.0",
|
||||||
|
"hatch-vcs>=0.4.0",
|
||||||
|
"pre-commit>=4.0.1",
|
||||||
|
"pytest>=8.3.4",
|
||||||
|
"pytest-asyncio>=0.25.2",
|
||||||
|
"pytest-cov>=6.0.0",
|
||||||
|
"pytest-ordering>=0.6",
|
||||||
|
"ruff>=0.9.2",
|
||||||
|
"types-deprecated>=1.2.15.20241117",
|
||||||
|
"types-requests>=2.32.0.20241016",
|
||||||
|
"types-ujson>=5.10.0.20240515",
|
||||||
|
]
|
||||||
|
|
||||||
|
[project.urls]
|
||||||
|
repository = "https://github.com/specklesystems/specklepy"
|
||||||
documentation = "https://speckle.guide/dev/py-examples.html"
|
documentation = "https://speckle.guide/dev/py-examples.html"
|
||||||
homepage = "https://speckle.systems/"
|
homepage = "https://speckle.systems/"
|
||||||
|
|
||||||
|
|
||||||
[tool.poetry.dependencies]
|
|
||||||
python = "^3.6.5"
|
|
||||||
pydantic = "^1.8.2"
|
|
||||||
appdirs = "^1.4.4"
|
|
||||||
gql = {version = ">=3.0.0b1", extras = ["all"], allow-prereleases = true}
|
|
||||||
ujson = "^4.3.0"
|
|
||||||
|
|
||||||
[tool.poetry.dev-dependencies]
|
|
||||||
black = "^20.8b1"
|
|
||||||
isort = "^5.7.0"
|
|
||||||
pytest = "^6.2.2"
|
|
||||||
pytest-ordering = "^0.6"
|
|
||||||
pytest-cov = "^3.0.0"
|
|
||||||
|
|
||||||
|
|
||||||
[tool.black]
|
|
||||||
exclude = '''
|
|
||||||
/(
|
|
||||||
\.eggs
|
|
||||||
| \.git
|
|
||||||
| \.hg
|
|
||||||
| \.mypy_cache
|
|
||||||
| \.tox
|
|
||||||
| \.venv
|
|
||||||
| _build
|
|
||||||
| buck-out
|
|
||||||
| build
|
|
||||||
| dist
|
|
||||||
)/
|
|
||||||
'''
|
|
||||||
include = '\.pyi?$'
|
|
||||||
line-length = 88
|
|
||||||
target-version = ["py36", "py37", "py38"]
|
|
||||||
|
|
||||||
|
|
||||||
[build-system]
|
[build-system]
|
||||||
requires = ["poetry-core>=1.0.0"]
|
requires = ["hatchling", "hatch-vcs"]
|
||||||
build-backend = "poetry.core.masonry.api"
|
build-backend = "hatchling.build"
|
||||||
|
|
||||||
|
[tool.hatch.version]
|
||||||
|
source = "vcs"
|
||||||
|
|
||||||
|
[tool.hatch.build.targets.wheel]
|
||||||
|
only-include = ["src", "licenses"]
|
||||||
|
sources = ["src"]
|
||||||
|
|
||||||
|
[tool.hatch.build.targets.sdist]
|
||||||
|
include = ["src", "licenses"]
|
||||||
|
|
||||||
|
[tool.hatch.version.raw-options]
|
||||||
|
local_scheme = "no-local-version"
|
||||||
|
|
||||||
|
[tool.commitizen]
|
||||||
|
name = "cz_conventional_commits"
|
||||||
|
version = "2.9.2"
|
||||||
|
tag_format = "$version"
|
||||||
|
|
||||||
|
[tool.ruff]
|
||||||
|
exclude = [".venv", "**/*.yml"]
|
||||||
|
|
||||||
|
[tool.ruff.lint]
|
||||||
|
select = [
|
||||||
|
# pycodestyle
|
||||||
|
"E",
|
||||||
|
# Pyflakes
|
||||||
|
"F",
|
||||||
|
# pyupgrade
|
||||||
|
"UP",
|
||||||
|
# flake8-bugbear
|
||||||
|
"B",
|
||||||
|
# flake8-simplify
|
||||||
|
"SIM",
|
||||||
|
# isort
|
||||||
|
"I",
|
||||||
|
]
|
||||||
|
ignore = ["UP006", "UP007", "UP035"]
|
||||||
|
|
||||||
|
[[tool.uv.index]]
|
||||||
|
name = "pypi"
|
||||||
|
url = "https://pypi.org/simple/"
|
||||||
|
publish-url = "https://upload.pypi.org/legacy/"
|
||||||
|
|
||||||
|
[[tool.uv.index]]
|
||||||
|
name = "test"
|
||||||
|
url = "https://test.pypi.org/simple/"
|
||||||
|
publish-url = "https://test.pypi.org/legacy/"
|
||||||
|
|||||||
@@ -1,147 +0,0 @@
|
|||||||
import re
|
|
||||||
from gql.client import SyncClientSession
|
|
||||||
from specklepy.logging.exceptions import SpeckleException
|
|
||||||
from typing import Dict
|
|
||||||
|
|
||||||
from specklepy.api import resources
|
|
||||||
from specklepy.api.resources import (
|
|
||||||
branch,
|
|
||||||
commit,
|
|
||||||
stream,
|
|
||||||
object,
|
|
||||||
server,
|
|
||||||
user,
|
|
||||||
subscriptions,
|
|
||||||
)
|
|
||||||
from specklepy.api.models import ServerInfo
|
|
||||||
from gql import Client, gql
|
|
||||||
from gql.transport.requests import RequestsHTTPTransport
|
|
||||||
from gql.transport.aiohttp import AIOHTTPTransport
|
|
||||||
from gql.transport.websockets import WebsocketsTransport
|
|
||||||
|
|
||||||
|
|
||||||
class SpeckleClient:
|
|
||||||
"""
|
|
||||||
The `SpeckleClient` is your entry point for interacting with your Speckle Server's GraphQL API.
|
|
||||||
You'll need to have access to a server to use it, or you can use our public server `speckle.xyz`.
|
|
||||||
|
|
||||||
To authenticate the client, you'll need to have downloaded the [Speckle Manager](https://speckle.guide/#speckle-manager)
|
|
||||||
and added your account.
|
|
||||||
|
|
||||||
```py
|
|
||||||
from specklepy.api.client import SpeckleClient
|
|
||||||
from specklepy.api.credentials import get_default_account
|
|
||||||
|
|
||||||
# initialise the client
|
|
||||||
client = SpeckleClient(host="speckle.xyz") # or whatever your host is
|
|
||||||
# client = SpeckleClient(host="localhost:3000", use_ssl=False) or use local server
|
|
||||||
|
|
||||||
# authenticate the client with a token (account has been added in Speckle Manager)
|
|
||||||
account = get_default_account()
|
|
||||||
client.authenticate(token=account.token)
|
|
||||||
|
|
||||||
# create a new stream. this returns the stream id
|
|
||||||
new_stream_id = client.stream.create(name="a shiny new stream")
|
|
||||||
|
|
||||||
# use that stream id to get the stream from the server
|
|
||||||
new_stream = client.stream.get(id=new_stream_id)
|
|
||||||
```
|
|
||||||
"""
|
|
||||||
|
|
||||||
DEFAULT_HOST = "speckle.xyz"
|
|
||||||
USE_SSL = True
|
|
||||||
|
|
||||||
def __init__(self, host: str = DEFAULT_HOST, use_ssl: bool = USE_SSL) -> None:
|
|
||||||
ws_protocol = "ws"
|
|
||||||
http_protocol = "http"
|
|
||||||
|
|
||||||
if use_ssl:
|
|
||||||
ws_protocol = "wss"
|
|
||||||
http_protocol = "https"
|
|
||||||
|
|
||||||
# sanitise host input by removing protocol and trailing slash
|
|
||||||
host = re.sub(r"((^\w+:|^)\/\/)|(\/$)", "", host)
|
|
||||||
|
|
||||||
self.url = f"{http_protocol}://{host}"
|
|
||||||
self.graphql = self.url + "/graphql"
|
|
||||||
self.ws_url = f"{ws_protocol}://{host}/graphql"
|
|
||||||
self.me = None
|
|
||||||
|
|
||||||
self.httpclient = Client(
|
|
||||||
transport=RequestsHTTPTransport(url=self.graphql, verify=True, retries=3)
|
|
||||||
)
|
|
||||||
self.wsclient = None
|
|
||||||
|
|
||||||
self._init_resources()
|
|
||||||
|
|
||||||
# Check compatibility with the server
|
|
||||||
try:
|
|
||||||
serverInfo = self.server.get()
|
|
||||||
if not isinstance(serverInfo, ServerInfo):
|
|
||||||
raise Exception("Couldn't get ServerInfo")
|
|
||||||
except Exception as ex:
|
|
||||||
raise SpeckleException(f"{self.url} is not a compatible Speckle Server", ex)
|
|
||||||
|
|
||||||
def __repr__(self):
|
|
||||||
return (
|
|
||||||
f"SpeckleClient( server: {self.url}, authenticated: {self.me is not None} )"
|
|
||||||
)
|
|
||||||
|
|
||||||
def authenticate(self, token: str) -> None:
|
|
||||||
"""Authenticate the client using a personal access token
|
|
||||||
The token is saved in the client object and a synchronous GraphQL entrypoint is created
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
token {str} -- an api token
|
|
||||||
"""
|
|
||||||
self.me = {"token": token}
|
|
||||||
headers = {
|
|
||||||
"Authorization": f"Bearer {self.me['token']}",
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
}
|
|
||||||
httptransport = RequestsHTTPTransport(
|
|
||||||
url=self.graphql, headers=headers, verify=True, retries=3
|
|
||||||
)
|
|
||||||
wstransport = WebsocketsTransport(
|
|
||||||
url=self.ws_url,
|
|
||||||
init_payload={"Authorization": f"Bearer {self.me['token']}"},
|
|
||||||
)
|
|
||||||
self.httpclient = Client(transport=httptransport)
|
|
||||||
self.wsclient = Client(transport=wstransport)
|
|
||||||
|
|
||||||
self._init_resources()
|
|
||||||
|
|
||||||
def execute_query(self, query: str) -> Dict:
|
|
||||||
return self.httpclient.execute(query)
|
|
||||||
|
|
||||||
def _init_resources(self) -> None:
|
|
||||||
self.stream = stream.Resource(
|
|
||||||
me=self.me, basepath=self.url, client=self.httpclient
|
|
||||||
)
|
|
||||||
self.commit = commit.Resource(
|
|
||||||
me=self.me, basepath=self.url, client=self.httpclient
|
|
||||||
)
|
|
||||||
self.branch = branch.Resource(
|
|
||||||
me=self.me, basepath=self.url, client=self.httpclient
|
|
||||||
)
|
|
||||||
self.object = object.Resource(
|
|
||||||
me=self.me, basepath=self.url, client=self.httpclient
|
|
||||||
)
|
|
||||||
self.server = server.Resource(
|
|
||||||
me=self.me, basepath=self.url, client=self.httpclient
|
|
||||||
)
|
|
||||||
self.user = user.Resource(me=self.me, basepath=self.url, client=self.httpclient)
|
|
||||||
self.subscribe = subscriptions.Resource(
|
|
||||||
me=self.me,
|
|
||||||
basepath=self.ws_url,
|
|
||||||
client=self.wsclient,
|
|
||||||
)
|
|
||||||
|
|
||||||
def __getattr__(self, name):
|
|
||||||
try:
|
|
||||||
attr = getattr(resources, name)
|
|
||||||
return attr.Resource(me=self.me, basepath=self.url, client=self.httpclient)
|
|
||||||
except:
|
|
||||||
raise SpeckleException(
|
|
||||||
f"Method {name} is not supported by the SpeckleClient class"
|
|
||||||
)
|
|
||||||
@@ -1,230 +0,0 @@
|
|||||||
import os
|
|
||||||
from warnings import warn
|
|
||||||
from pydantic import BaseModel
|
|
||||||
from typing import List, Optional
|
|
||||||
from urllib.parse import urlparse, unquote
|
|
||||||
from specklepy.logging import metrics
|
|
||||||
from specklepy.api.models import ServerInfo
|
|
||||||
from specklepy.api.client import SpeckleClient
|
|
||||||
from specklepy.transports.sqlite import SQLiteTransport
|
|
||||||
from specklepy.transports.server.server import ServerTransport
|
|
||||||
from specklepy.logging.exceptions import SpeckleException, SpeckleWarning
|
|
||||||
|
|
||||||
|
|
||||||
class UserInfo(BaseModel):
|
|
||||||
name: str
|
|
||||||
email: str
|
|
||||||
company: Optional[str]
|
|
||||||
id: str
|
|
||||||
|
|
||||||
|
|
||||||
class Account(BaseModel):
|
|
||||||
isDefault: bool = None
|
|
||||||
token: str
|
|
||||||
refreshToken: str = None
|
|
||||||
serverInfo: ServerInfo
|
|
||||||
userInfo: UserInfo
|
|
||||||
id: str = None
|
|
||||||
|
|
||||||
def __repr__(self) -> str:
|
|
||||||
return f"Account(email: {self.userInfo.email}, server: {self.serverInfo.url}, isDefault: {self.isDefault})"
|
|
||||||
|
|
||||||
def __str__(self) -> str:
|
|
||||||
return self.__repr__()
|
|
||||||
|
|
||||||
|
|
||||||
def get_local_accounts(base_path: str = None) -> List[Account]:
|
|
||||||
"""Gets all the accounts present in this environment
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
base_path {str} -- custom base path if you are not using the system default
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
List[Account] -- list of all local accounts or an empty list if no accounts were found
|
|
||||||
"""
|
|
||||||
metrics.track(metrics.ACCOUNT_LIST)
|
|
||||||
account_storage = SQLiteTransport(scope="Accounts", base_path=base_path)
|
|
||||||
json_path = os.path.join(account_storage._base_path, "Accounts")
|
|
||||||
os.makedirs(json_path, exist_ok=True)
|
|
||||||
json_acct_files = [file for file in os.listdir(json_path) if file.endswith(".json")]
|
|
||||||
|
|
||||||
accounts = []
|
|
||||||
res = account_storage.get_all_objects()
|
|
||||||
if res:
|
|
||||||
accounts.extend(Account.parse_raw(r[1]) for r in res)
|
|
||||||
if json_acct_files:
|
|
||||||
try:
|
|
||||||
accounts.extend(
|
|
||||||
Account.parse_file(os.path.join(json_path, json_file))
|
|
||||||
for json_file in json_acct_files
|
|
||||||
)
|
|
||||||
except Exception as ex:
|
|
||||||
raise SpeckleException(
|
|
||||||
"Invalid json accounts could not be read. Please fix or remove them.",
|
|
||||||
ex,
|
|
||||||
)
|
|
||||||
|
|
||||||
return accounts
|
|
||||||
|
|
||||||
|
|
||||||
def get_default_account(base_path: str = None) -> Account:
|
|
||||||
"""Gets this environment's default account if any. If there is no default, the first found will be returned and set as default.
|
|
||||||
Arguments:
|
|
||||||
base_path {str} -- custom base path if you are not using the system default
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Account -- the default account or None if no local accounts were found
|
|
||||||
"""
|
|
||||||
metrics.track(metrics.ACCOUNT_DEFAULT)
|
|
||||||
accounts = get_local_accounts(base_path=base_path)
|
|
||||||
if not accounts:
|
|
||||||
return None
|
|
||||||
|
|
||||||
default = next((acc for acc in accounts if acc.isDefault), None)
|
|
||||||
if not default:
|
|
||||||
default = accounts[0]
|
|
||||||
default.isDefault = True
|
|
||||||
|
|
||||||
return default
|
|
||||||
|
|
||||||
|
|
||||||
class StreamWrapper:
|
|
||||||
"""
|
|
||||||
The `StreamWrapper` gives you some handy helpers to deal with urls and get authenticated clients and transports.
|
|
||||||
|
|
||||||
Construct a `StreamWrapper` with a stream, branch, commit, or object URL. The corresponding ids will be stored
|
|
||||||
in the wrapper. If you have local accounts on the machine, you can use the `get_account` and `get_client` methods
|
|
||||||
to get a local account for the server. You can also pass a token into `get_client` if you don't have a corresponding
|
|
||||||
local account for the server.
|
|
||||||
|
|
||||||
```py
|
|
||||||
from specklepy.api.credentials import StreamWrapper
|
|
||||||
|
|
||||||
# provide any stream, branch, commit, object, or globals url
|
|
||||||
wrapper = StreamWrapper("https://speckle.xyz/streams/3073b96e86/commits/604bea8cc6")
|
|
||||||
|
|
||||||
# get an authenticated SpeckleClient if you have a local account for the server
|
|
||||||
client = wrapper.get_client()
|
|
||||||
|
|
||||||
# get an authenticated ServerTransport if you have a local account for the server
|
|
||||||
transport = wrapper.get_transport()
|
|
||||||
```
|
|
||||||
"""
|
|
||||||
|
|
||||||
stream_url: str = None
|
|
||||||
use_ssl: bool = True
|
|
||||||
host: str = None
|
|
||||||
stream_id: str = None
|
|
||||||
commit_id: str = None
|
|
||||||
object_id: str = None
|
|
||||||
branch_name: str = None
|
|
||||||
client: SpeckleClient = None
|
|
||||||
account: Account = None
|
|
||||||
|
|
||||||
def __repr__(self):
|
|
||||||
return f"StreamWrapper( server: {self.host}, stream_id: {self.stream_id}, type: {self.type} )"
|
|
||||||
|
|
||||||
def __str__(self) -> str:
|
|
||||||
return self.__repr__()
|
|
||||||
|
|
||||||
@property
|
|
||||||
def type(self) -> str:
|
|
||||||
if self.object_id:
|
|
||||||
return "object"
|
|
||||||
elif self.commit_id:
|
|
||||||
return "commit"
|
|
||||||
elif self.branch_name:
|
|
||||||
return "branch"
|
|
||||||
else:
|
|
||||||
return "stream" if self.stream_id else "invalid"
|
|
||||||
|
|
||||||
def __init__(self, url: str) -> None:
|
|
||||||
metrics.track("streamwrapper")
|
|
||||||
self.stream_url = url
|
|
||||||
parsed = urlparse(url)
|
|
||||||
self.host = parsed.netloc
|
|
||||||
self.use_ssl = parsed.scheme == "https"
|
|
||||||
segments = parsed.path.strip("/").split("/", 3)
|
|
||||||
|
|
||||||
if not segments or len(segments) < 2:
|
|
||||||
raise SpeckleException(
|
|
||||||
f"Cannot parse {url} into a stream wrapper class - invalid URL provided."
|
|
||||||
)
|
|
||||||
|
|
||||||
while segments:
|
|
||||||
segment = segments.pop(0)
|
|
||||||
if segments and segment.lower() == "streams":
|
|
||||||
self.stream_id = segments.pop(0)
|
|
||||||
elif segments and segment.lower() == "commits":
|
|
||||||
self.commit_id = segments.pop(0)
|
|
||||||
elif segments and segment.lower() == "branches":
|
|
||||||
self.branch_name = unquote(segments.pop(0))
|
|
||||||
elif segments and segment.lower() == "objects":
|
|
||||||
self.object_id = segments.pop(0)
|
|
||||||
elif segment.lower() == "globals":
|
|
||||||
self.branch_name = "globals"
|
|
||||||
if segments:
|
|
||||||
self.commit_id = segments.pop(0)
|
|
||||||
else:
|
|
||||||
raise SpeckleException(
|
|
||||||
f"Cannot parse {url} into a stream wrapper class - invalid URL provided."
|
|
||||||
)
|
|
||||||
|
|
||||||
if not self.stream_id:
|
|
||||||
raise SpeckleException(
|
|
||||||
f"Cannot parse {url} into a stream wrapper class - no stream id found."
|
|
||||||
)
|
|
||||||
|
|
||||||
def get_account(self) -> Account:
|
|
||||||
"""
|
|
||||||
Gets an account object for this server from the local accounts db (added via Speckle Manager or a json file)
|
|
||||||
"""
|
|
||||||
if self.account:
|
|
||||||
return self.account
|
|
||||||
|
|
||||||
self.account = next(
|
|
||||||
(a for a in get_local_accounts() if self.host in a.serverInfo.url),
|
|
||||||
None,
|
|
||||||
)
|
|
||||||
|
|
||||||
return self.account
|
|
||||||
|
|
||||||
def get_client(self, token: str = None) -> SpeckleClient:
|
|
||||||
"""
|
|
||||||
Gets an authenticated client for this server. You may provide a token if there aren't any local accounts on this
|
|
||||||
machine. If no account is found and no token is provided, an unauthenticated client is returned.
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
token {str} -- optional token if no local account is available (defaults to None)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
SpeckleClient -- authenticated with a corresponding local account or the provided token
|
|
||||||
"""
|
|
||||||
if self.client and token is None:
|
|
||||||
return self.client
|
|
||||||
|
|
||||||
if not self.account:
|
|
||||||
self.get_account()
|
|
||||||
|
|
||||||
if not self.client:
|
|
||||||
self.client = SpeckleClient(host=self.host, use_ssl=self.use_ssl)
|
|
||||||
|
|
||||||
if self.account is None and token is None:
|
|
||||||
warn(f"No local account found for server {self.host}", SpeckleWarning)
|
|
||||||
return self.client
|
|
||||||
|
|
||||||
self.client.authenticate(self.account.token if self.account else token)
|
|
||||||
|
|
||||||
return self.client
|
|
||||||
|
|
||||||
def get_transport(self, token: str = None) -> ServerTransport:
|
|
||||||
"""
|
|
||||||
Gets a server transport for this stream using an authenticated client. If there is no local account for this
|
|
||||||
server and the client was not authenticated with a token, this will throw an exception.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
ServerTransport -- constructed for this stream with a pre-authenticated client
|
|
||||||
"""
|
|
||||||
if not self.client or not self.client.me:
|
|
||||||
self.get_client(token)
|
|
||||||
return ServerTransport(self.stream_id, self.client)
|
|
||||||
@@ -1,119 +0,0 @@
|
|||||||
# generated by datamodel-codegen:
|
|
||||||
# filename: stream_schema.json
|
|
||||||
# timestamp: 2020-11-17T14:33:13+00:00
|
|
||||||
|
|
||||||
from datetime import datetime
|
|
||||||
from typing import Any, Dict, List, Optional
|
|
||||||
|
|
||||||
|
|
||||||
from pydantic import BaseModel
|
|
||||||
|
|
||||||
|
|
||||||
class Collaborator(BaseModel):
|
|
||||||
id: Optional[str]
|
|
||||||
name: Optional[str]
|
|
||||||
role: Optional[str]
|
|
||||||
avatar: Optional[str]
|
|
||||||
|
|
||||||
|
|
||||||
class Commit(BaseModel):
|
|
||||||
id: Optional[str]
|
|
||||||
message: Optional[str]
|
|
||||||
authorName: Optional[str]
|
|
||||||
authorId: Optional[str]
|
|
||||||
authorAvatar: Optional[str]
|
|
||||||
branchName: Optional[str]
|
|
||||||
createdAt: Optional[str]
|
|
||||||
sourceApplication: Optional[str]
|
|
||||||
referencedObject: Optional[str]
|
|
||||||
totalChildrenCount: Optional[int]
|
|
||||||
parents: Optional[List[str]]
|
|
||||||
|
|
||||||
def __repr__(self) -> str:
|
|
||||||
return f"Commit( id: {self.id}, message: {self.message}, referencedObject: {self.referencedObject}, authorName: {self.authorName}, branchName: {self.branchName}, createdAt: {self.createdAt} )"
|
|
||||||
|
|
||||||
def __str__(self) -> str:
|
|
||||||
return self.__repr__()
|
|
||||||
|
|
||||||
|
|
||||||
class Commits(BaseModel):
|
|
||||||
totalCount: Optional[int]
|
|
||||||
cursor: Optional[Any]
|
|
||||||
items: List[Commit] = []
|
|
||||||
|
|
||||||
|
|
||||||
class Object(BaseModel):
|
|
||||||
id: Optional[str]
|
|
||||||
speckleType: Optional[str]
|
|
||||||
applicationId: Optional[str]
|
|
||||||
totalChildrenCount: Optional[int]
|
|
||||||
createdAt: Optional[str]
|
|
||||||
|
|
||||||
|
|
||||||
class Branch(BaseModel):
|
|
||||||
id: Optional[str]
|
|
||||||
name: Optional[str]
|
|
||||||
description: Optional[str]
|
|
||||||
commits: Optional[Commits]
|
|
||||||
|
|
||||||
|
|
||||||
class Branches(BaseModel):
|
|
||||||
totalCount: Optional[int]
|
|
||||||
cursor: Optional[datetime]
|
|
||||||
items: List[Branch] = []
|
|
||||||
|
|
||||||
|
|
||||||
class Stream(BaseModel):
|
|
||||||
id: Optional[str]
|
|
||||||
name: Optional[str]
|
|
||||||
description: Optional[str]
|
|
||||||
isPublic: Optional[bool]
|
|
||||||
createdAt: Optional[str]
|
|
||||||
updatedAt: Optional[str]
|
|
||||||
collaborators: List[Collaborator] = []
|
|
||||||
branches: Optional[Branches]
|
|
||||||
commit: Optional[Commit]
|
|
||||||
object: Optional[Object]
|
|
||||||
|
|
||||||
def __repr__(self):
|
|
||||||
return f"Stream( id: {self.id}, name: {self.name}, description: {self.description}, isPublic: {self.isPublic})"
|
|
||||||
|
|
||||||
def __str__(self) -> str:
|
|
||||||
return self.__repr__()
|
|
||||||
|
|
||||||
|
|
||||||
class Streams(BaseModel):
|
|
||||||
totalCount: Optional[int]
|
|
||||||
cursor: Optional[datetime]
|
|
||||||
items: List[Stream] = []
|
|
||||||
|
|
||||||
|
|
||||||
class User(BaseModel):
|
|
||||||
id: Optional[str]
|
|
||||||
email: Optional[str]
|
|
||||||
name: Optional[str]
|
|
||||||
bio: Optional[str]
|
|
||||||
company: Optional[str]
|
|
||||||
avatar: Optional[str]
|
|
||||||
verified: Optional[bool]
|
|
||||||
role: Optional[str]
|
|
||||||
streams: Optional[Streams]
|
|
||||||
|
|
||||||
def __repr__(self):
|
|
||||||
return f"User( id: {self.id}, name: {self.name}, email: {self.email}, company: {self.company} )"
|
|
||||||
|
|
||||||
def __str__(self) -> str:
|
|
||||||
return self.__repr__()
|
|
||||||
|
|
||||||
|
|
||||||
class ServerInfo(BaseModel):
|
|
||||||
name: Optional[str]
|
|
||||||
company: Optional[str]
|
|
||||||
url: Optional[str]
|
|
||||||
description: Optional[str]
|
|
||||||
adminContact: Optional[str]
|
|
||||||
canonicalUrl: Optional[str]
|
|
||||||
roles: Optional[List[dict]]
|
|
||||||
scopes: Optional[List[dict]]
|
|
||||||
authStrategies: Optional[List[dict]]
|
|
||||||
version: Optional[str]
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
from specklepy.transports.sqlite import SQLiteTransport
|
|
||||||
from typing import Dict, List
|
|
||||||
from gql.client import Client
|
|
||||||
from gql.gql import gql
|
|
||||||
from gql.transport.exceptions import TransportQueryError
|
|
||||||
from specklepy.logging.exceptions import GraphQLException, SpeckleException
|
|
||||||
from specklepy.serialization.base_object_serializer import BaseObjectSerializer
|
|
||||||
|
|
||||||
|
|
||||||
class ResourceBase(object):
|
|
||||||
def __init__(
|
|
||||||
self,
|
|
||||||
me: Dict,
|
|
||||||
basepath: str,
|
|
||||||
client: Client,
|
|
||||||
name: str,
|
|
||||||
methods: list,
|
|
||||||
) -> None:
|
|
||||||
self.me = me
|
|
||||||
self.basepath = basepath
|
|
||||||
self.client = client
|
|
||||||
self.name = name
|
|
||||||
self.methods = methods
|
|
||||||
self.schema = None
|
|
||||||
|
|
||||||
def _step_into_response(self, response: dict, return_type: str or List):
|
|
||||||
"""Step into the dict to get the relevant data"""
|
|
||||||
if return_type is None:
|
|
||||||
return response
|
|
||||||
elif isinstance(return_type, str):
|
|
||||||
return response[return_type]
|
|
||||||
elif isinstance(return_type, List):
|
|
||||||
for key in return_type:
|
|
||||||
response = response[key]
|
|
||||||
return response
|
|
||||||
|
|
||||||
def _parse_response(self, response: dict or list, schema=None):
|
|
||||||
"""Try to create a class instance from the response"""
|
|
||||||
if isinstance(response, list):
|
|
||||||
return [self._parse_response(response=r, schema=schema) for r in response]
|
|
||||||
if schema:
|
|
||||||
return schema.parse_obj(response)
|
|
||||||
elif self.schema:
|
|
||||||
try:
|
|
||||||
return self.schema.parse_obj(response)
|
|
||||||
except:
|
|
||||||
s = BaseObjectSerializer(read_transport=SQLiteTransport())
|
|
||||||
return s.recompose_base(response)
|
|
||||||
else:
|
|
||||||
return response
|
|
||||||
|
|
||||||
def make_request(
|
|
||||||
self,
|
|
||||||
query: gql,
|
|
||||||
params: Dict = None,
|
|
||||||
return_type: str or List = None,
|
|
||||||
schema=None,
|
|
||||||
parse_response: bool = True,
|
|
||||||
) -> Dict or GraphQLException:
|
|
||||||
"""Executes the GraphQL query"""
|
|
||||||
try:
|
|
||||||
response = self.client.execute(query, variable_values=params)
|
|
||||||
except Exception as e:
|
|
||||||
if isinstance(e, TransportQueryError):
|
|
||||||
return GraphQLException(
|
|
||||||
message=f"Failed to execute the GraphQL {self.name} request. Errors: {e.errors}",
|
|
||||||
errors=e.errors,
|
|
||||||
data=e.data,
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
return SpeckleException(
|
|
||||||
message=f"Failed to execute the GraphQL {self.name} request. Inner exception: {e}",
|
|
||||||
exception=e,
|
|
||||||
)
|
|
||||||
|
|
||||||
response = self._step_into_response(response=response, return_type=return_type)
|
|
||||||
|
|
||||||
if parse_response:
|
|
||||||
return self._parse_response(response=response, schema=schema)
|
|
||||||
else:
|
|
||||||
return response
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
from pathlib import Path
|
|
||||||
import sys
|
|
||||||
import inspect
|
|
||||||
import pkgutil
|
|
||||||
from importlib import import_module
|
|
||||||
|
|
||||||
|
|
||||||
for (_, name, _) in pkgutil.iter_modules(__path__):
|
|
||||||
|
|
||||||
imported_module = import_module("." + name, package=__name__)
|
|
||||||
|
|
||||||
if hasattr(imported_module, "Resource"):
|
|
||||||
setattr(sys.modules[__name__], name, imported_module)
|
|
||||||
@@ -1,212 +0,0 @@
|
|||||||
from specklepy.api.resources import stream
|
|
||||||
from typing import List, Optional
|
|
||||||
from gql import gql
|
|
||||||
from pydantic.main import BaseModel
|
|
||||||
from specklepy.api.resource import ResourceBase
|
|
||||||
from specklepy.api.models import Branch
|
|
||||||
|
|
||||||
NAME = "branch"
|
|
||||||
METHODS = ["create"]
|
|
||||||
|
|
||||||
|
|
||||||
class Resource(ResourceBase):
|
|
||||||
"""API Access class for branches"""
|
|
||||||
|
|
||||||
def __init__(self, me, basepath, client) -> None:
|
|
||||||
super().__init__(
|
|
||||||
me=me, basepath=basepath, client=client, name=NAME, methods=METHODS
|
|
||||||
)
|
|
||||||
self.schema = Branch
|
|
||||||
|
|
||||||
def create(
|
|
||||||
self, stream_id: str, name: str, description: str = "No description provided"
|
|
||||||
) -> str:
|
|
||||||
"""Create a new branch on this stream
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
name {str} -- the name of the new branch
|
|
||||||
description {str} -- a short description of the branch
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
id {str} -- the newly created branch's id
|
|
||||||
"""
|
|
||||||
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
mutation BranchCreate($branch: BranchCreateInput!) {
|
|
||||||
branchCreate(branch: $branch)
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
params = {
|
|
||||||
"branch": {
|
|
||||||
"streamId": stream_id,
|
|
||||||
"name": name,
|
|
||||||
"description": description,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query, params=params, return_type="branchCreate", parse_response=False
|
|
||||||
)
|
|
||||||
|
|
||||||
def get(self, stream_id: str, name: str, commits_limit: int = 10):
|
|
||||||
"""Get a branch by name from a stream
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
stream_id {str} -- the id of the stream to get the branch from
|
|
||||||
name {str} -- the name of the branch to get
|
|
||||||
commits_limit {int} -- maximum number of commits to get
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Branch -- the fetched branch with its latest commits
|
|
||||||
"""
|
|
||||||
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
query BranchGet($stream_id: String!, $name: String!, $commits_limit: Int!) {
|
|
||||||
stream(id: $stream_id) {
|
|
||||||
branch(name: $name) {
|
|
||||||
id,
|
|
||||||
name,
|
|
||||||
description,
|
|
||||||
commits (limit: $commits_limit) {
|
|
||||||
totalCount,
|
|
||||||
cursor,
|
|
||||||
items {
|
|
||||||
id,
|
|
||||||
referencedObject,
|
|
||||||
sourceApplication,
|
|
||||||
totalChildrenCount,
|
|
||||||
message,
|
|
||||||
authorName,
|
|
||||||
authorId,
|
|
||||||
branchName,
|
|
||||||
parents,
|
|
||||||
createdAt
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
|
|
||||||
params = {"stream_id": stream_id, "name": name, "commits_limit": commits_limit}
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query, params=params, return_type=["stream", "branch"]
|
|
||||||
)
|
|
||||||
|
|
||||||
def list(self, stream_id: str, branches_limit: int = 10, commits_limit: int = 10):
|
|
||||||
"""Get a list of branches from a given stream
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
stream_id {str} -- the id of the stream to get the branches from
|
|
||||||
branches_limit {int} -- maximum number of branches to get
|
|
||||||
commits_limit {int} -- maximum number of commits to get
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
List[Branch] -- the branches on the stream
|
|
||||||
"""
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
query BranchesGet($stream_id: String!, $branches_limit: Int!, $commits_limit: Int!) {
|
|
||||||
stream(id: $stream_id) {
|
|
||||||
branches(limit: $branches_limit) {
|
|
||||||
items {
|
|
||||||
id
|
|
||||||
name
|
|
||||||
description
|
|
||||||
commits(limit: $commits_limit) {
|
|
||||||
totalCount
|
|
||||||
items{
|
|
||||||
id
|
|
||||||
message
|
|
||||||
referencedObject
|
|
||||||
sourceApplication
|
|
||||||
parents
|
|
||||||
authorId
|
|
||||||
authorName
|
|
||||||
branchName
|
|
||||||
createdAt
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
|
|
||||||
params = {
|
|
||||||
"stream_id": stream_id,
|
|
||||||
"branches_limit": branches_limit,
|
|
||||||
"commits_limit": commits_limit,
|
|
||||||
}
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query, params=params, return_type=["stream", "branches", "items"]
|
|
||||||
)
|
|
||||||
|
|
||||||
def update(
|
|
||||||
self, stream_id: str, branch_id: str, name: str = None, description: str = None
|
|
||||||
):
|
|
||||||
"""Update a branch
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
stream_id {str} -- the id of the stream containing the branch to update
|
|
||||||
branch_id {str} -- the id of the branch to update
|
|
||||||
name {str} -- optional: the updated branch name
|
|
||||||
description {str} -- optional: the updated branch description
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
bool -- True if update is successfull
|
|
||||||
"""
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
mutation BranchUpdate($branch: BranchUpdateInput!) {
|
|
||||||
branchUpdate(branch: $branch)
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
params = {
|
|
||||||
"branch": {
|
|
||||||
"streamId": stream_id,
|
|
||||||
"id": branch_id,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if name:
|
|
||||||
params["branch"]["name"] = name
|
|
||||||
if description:
|
|
||||||
params["branch"]["description"] = description
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query, params=params, return_type="branchUpdate", parse_response=False
|
|
||||||
)
|
|
||||||
|
|
||||||
def delete(self, stream_id: str, branch_id: str):
|
|
||||||
"""Delete a branch
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
stream_id {str} -- the id of the stream containing the branch to delete
|
|
||||||
branch_id {str} -- the branch to delete
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
bool -- True if deletion is successful
|
|
||||||
"""
|
|
||||||
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
mutation BranchDelete($branch: BranchDeleteInput!) {
|
|
||||||
branchDelete(branch: $branch)
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
|
|
||||||
params = {"branch": {"streamId": stream_id, "id": branch_id}}
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query, params=params, return_type="branchDelete", parse_response=False
|
|
||||||
)
|
|
||||||
@@ -1,225 +0,0 @@
|
|||||||
from typing import Optional, List
|
|
||||||
from gql import gql
|
|
||||||
from specklepy.api.resource import ResourceBase
|
|
||||||
from specklepy.api.models import Commit
|
|
||||||
|
|
||||||
|
|
||||||
NAME = "commit"
|
|
||||||
METHODS = []
|
|
||||||
|
|
||||||
|
|
||||||
class Resource(ResourceBase):
|
|
||||||
"""API Access class for commits"""
|
|
||||||
|
|
||||||
def __init__(self, me, basepath, client) -> None:
|
|
||||||
super().__init__(
|
|
||||||
me=me, basepath=basepath, client=client, name=NAME, methods=METHODS
|
|
||||||
)
|
|
||||||
self.schema = Commit
|
|
||||||
|
|
||||||
def get(self, stream_id: str, commit_id: str) -> Commit:
|
|
||||||
"""
|
|
||||||
Gets a commit given a stream and the commit id
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
stream_id {str} -- the stream where we can find the commit
|
|
||||||
commit_id {str} -- the id of the commit you want to get
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Commit -- the retrieved commit object
|
|
||||||
"""
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
query Commit($stream_id: String!, $commit_id: String!) {
|
|
||||||
stream(id: $stream_id) {
|
|
||||||
commit(id: $commit_id) {
|
|
||||||
id
|
|
||||||
message
|
|
||||||
referencedObject
|
|
||||||
authorId
|
|
||||||
authorName
|
|
||||||
authorAvatar
|
|
||||||
branchName
|
|
||||||
createdAt
|
|
||||||
sourceApplication
|
|
||||||
totalChildrenCount
|
|
||||||
parents
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
params = {"stream_id": stream_id, "commit_id": commit_id}
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query, params=params, return_type=["stream", "commit"]
|
|
||||||
)
|
|
||||||
|
|
||||||
def list(self, stream_id: str, limit: int = 10) -> List[Commit]:
|
|
||||||
"""
|
|
||||||
Get a list of commits on a given stream
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
stream_id {str} -- the stream where the commits are
|
|
||||||
limit {int} -- the maximum number of commits to fetch (default = 10)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
List[Commit] -- a list of the most recent commit objects
|
|
||||||
"""
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
query Commits($stream_id: String!, $limit: Int!) {
|
|
||||||
stream(id: $stream_id) {
|
|
||||||
commits(limit: $limit) {
|
|
||||||
items {
|
|
||||||
id
|
|
||||||
message
|
|
||||||
referencedObject
|
|
||||||
authorName
|
|
||||||
authorId
|
|
||||||
authorName
|
|
||||||
authorAvatar
|
|
||||||
branchName
|
|
||||||
createdAt
|
|
||||||
sourceApplication
|
|
||||||
totalChildrenCount
|
|
||||||
parents
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
params = {"stream_id": stream_id, "limit": limit}
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query, params=params, return_type=["stream", "commits", "items"]
|
|
||||||
)
|
|
||||||
|
|
||||||
def create(
|
|
||||||
self,
|
|
||||||
stream_id: str,
|
|
||||||
object_id: str,
|
|
||||||
branch_name: str = "main",
|
|
||||||
message: str = "",
|
|
||||||
source_application: str = "python",
|
|
||||||
parents: List[str] = None,
|
|
||||||
) -> str:
|
|
||||||
"""
|
|
||||||
Creates a commit on a branch
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
stream_id {str} -- the stream you want to commit to
|
|
||||||
object_id {str} -- the hash of your commit object
|
|
||||||
branch_name {str} -- the name of the branch to commit to (defaults to "main")
|
|
||||||
message {str} -- optional: a message to give more information about the commit
|
|
||||||
source_application{str} -- optional: the application from which the commit was created (defaults to "python")
|
|
||||||
parents {List[str]} -- optional: the id of the parent commits
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
str -- the id of the created commit
|
|
||||||
"""
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
mutation CommitCreate ($commit: CommitCreateInput!){ commitCreate(commit: $commit)}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
params = {
|
|
||||||
"commit": {
|
|
||||||
"streamId": stream_id,
|
|
||||||
"branchName": branch_name,
|
|
||||||
"objectId": object_id,
|
|
||||||
"message": message,
|
|
||||||
"sourceApplication": source_application,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if parents:
|
|
||||||
params["commit"]["parents"] = parents
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query, params=params, return_type="commitCreate", parse_response=False
|
|
||||||
)
|
|
||||||
|
|
||||||
def update(self, stream_id: str, commit_id: str, message: str) -> bool:
|
|
||||||
"""
|
|
||||||
Update a commit
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
stream_id {str} -- the id of the stream that contains the commit you'd like to update
|
|
||||||
commit_id {str} -- the id of the commit you'd like to update
|
|
||||||
message {str} -- the updated commit message
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
bool -- True if the operation succeeded
|
|
||||||
"""
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
mutation CommitUpdate($commit: CommitUpdateInput!){ commitUpdate(commit: $commit)}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
params = {
|
|
||||||
"commit": {"streamId": stream_id, "id": commit_id, "message": message}
|
|
||||||
}
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query, params=params, return_type="commitUpdate", parse_response=False
|
|
||||||
)
|
|
||||||
|
|
||||||
def delete(self, stream_id: str, commit_id: str) -> bool:
|
|
||||||
"""
|
|
||||||
Delete a commit
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
stream_id {str} -- the id of the stream that contains the commit you'd like to delete
|
|
||||||
commit_id {str} -- the id of the commit you'd like to delete
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
bool -- True if the operation succeeded
|
|
||||||
"""
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
mutation CommitDelete($commit: CommitDeleteInput!){ commitDelete(commit: $commit)}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
params = {"commit": {"streamId": stream_id, "id": commit_id}}
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query, params=params, return_type="commitDelete", parse_response=False
|
|
||||||
)
|
|
||||||
|
|
||||||
def received(
|
|
||||||
self,
|
|
||||||
stream_id: str,
|
|
||||||
commit_id: str,
|
|
||||||
source_application: str = "python",
|
|
||||||
message: Optional[str] = None,
|
|
||||||
) -> bool:
|
|
||||||
"""
|
|
||||||
Mark a commit object a received by the source application.
|
|
||||||
"""
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
mutation CommitReceive($receivedInput:CommitReceivedInput!){
|
|
||||||
commitReceive(input:$receivedInput)
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
params = {
|
|
||||||
"receivedInput": {
|
|
||||||
"sourceApplication": source_application,
|
|
||||||
"streamId": stream_id,
|
|
||||||
"commitId": commit_id,
|
|
||||||
"message": "message",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try:
|
|
||||||
return self.make_request(
|
|
||||||
query=query,
|
|
||||||
params=params,
|
|
||||||
return_type="commitReceive",
|
|
||||||
parse_response=False,
|
|
||||||
)
|
|
||||||
except Exception as ex:
|
|
||||||
print(ex.with_traceback)
|
|
||||||
return False
|
|
||||||
@@ -1,80 +0,0 @@
|
|||||||
from typing import Dict, List
|
|
||||||
from gql import gql
|
|
||||||
from graphql.language import parser
|
|
||||||
from specklepy.api.resource import ResourceBase
|
|
||||||
from specklepy.objects.base import Base
|
|
||||||
|
|
||||||
NAME = "object"
|
|
||||||
METHODS = []
|
|
||||||
|
|
||||||
|
|
||||||
class Resource(ResourceBase):
|
|
||||||
"""API Access class for objects"""
|
|
||||||
|
|
||||||
def __init__(self, me, basepath, client) -> None:
|
|
||||||
super().__init__(
|
|
||||||
me=me, basepath=basepath, client=client, name=NAME, methods=METHODS
|
|
||||||
)
|
|
||||||
self.schema = Base
|
|
||||||
|
|
||||||
def get(self, stream_id: str, object_id: str) -> Base:
|
|
||||||
"""
|
|
||||||
Get a stream object
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
stream_id {str} -- the id of the stream for the object
|
|
||||||
object_id {str} -- the hash of the object you want to get
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Base -- the returned Base object
|
|
||||||
"""
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
query Object($stream_id: String!, $object_id: String!) {
|
|
||||||
stream(id: $stream_id) {
|
|
||||||
id
|
|
||||||
name
|
|
||||||
object(id: $object_id) {
|
|
||||||
id
|
|
||||||
speckleType
|
|
||||||
applicationId
|
|
||||||
createdAt
|
|
||||||
totalChildrenCount
|
|
||||||
data
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
params = {"stream_id": stream_id, "object_id": object_id}
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query, params=params, return_type=["stream", "object", "data"]
|
|
||||||
)
|
|
||||||
|
|
||||||
def create(self, stream_id: str, objects: List[Dict]) -> str:
|
|
||||||
"""
|
|
||||||
Not advised - generally, you want to use `operations.send()`.
|
|
||||||
|
|
||||||
Create a new object on a stream. To send a base object, you can prepare it by running it through the
|
|
||||||
`BaseObjectSerializer.traverse_base()` function to get a valid (serialisable) object to send.
|
|
||||||
|
|
||||||
NOTE: this does not create a commit - you can create one with `SpeckleClient.commit.create`. Dynamic fields will be located in the 'data' dict of the received `Base` object
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
stream_id {str} -- the id of the stream you want to send the object to
|
|
||||||
objects {List[Dict]} -- a list of base dictionary objects (NOTE: must be json serialisable)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
str -- the id of the object
|
|
||||||
"""
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
mutation ObjectCreate($object_input: ObjectCreateInput!) { objectCreate(objectInput: $object_input) }
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
params = {"object_input": {"streamId": stream_id, "objects": objects}}
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query, params=params, return_type="objectCreate", parse_response=False
|
|
||||||
)
|
|
||||||
@@ -1,364 +0,0 @@
|
|||||||
from gql import gql
|
|
||||||
from typing import Dict, List, Optional
|
|
||||||
from specklepy.logging import metrics
|
|
||||||
from specklepy.api.models import Stream
|
|
||||||
from specklepy.api.resource import ResourceBase
|
|
||||||
|
|
||||||
|
|
||||||
NAME = "stream"
|
|
||||||
METHODS = [
|
|
||||||
"list",
|
|
||||||
"create",
|
|
||||||
"get",
|
|
||||||
"update",
|
|
||||||
"delete",
|
|
||||||
"search",
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
class Resource(ResourceBase):
|
|
||||||
"""API Access class for streams"""
|
|
||||||
|
|
||||||
def __init__(self, me, basepath, client) -> None:
|
|
||||||
super().__init__(
|
|
||||||
me=me, basepath=basepath, client=client, name=NAME, methods=METHODS
|
|
||||||
)
|
|
||||||
|
|
||||||
self.schema = Stream
|
|
||||||
|
|
||||||
def get(self, id: str, branch_limit: int = 10, commit_limit: int = 10) -> Stream:
|
|
||||||
"""Get the specified stream from the server
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
id {str} -- the stream id
|
|
||||||
branch_limit {int} -- the maximum number of branches to return
|
|
||||||
commit_limit {int} -- the maximum number of commits to return
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Stream -- the retrieved stream
|
|
||||||
"""
|
|
||||||
metrics.track(metrics.STREAM_GET)
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
query Stream($id: String!, $branch_limit: Int!, $commit_limit: Int!) {
|
|
||||||
stream(id: $id) {
|
|
||||||
id
|
|
||||||
name
|
|
||||||
description
|
|
||||||
isPublic
|
|
||||||
createdAt
|
|
||||||
updatedAt
|
|
||||||
collaborators {
|
|
||||||
id
|
|
||||||
name
|
|
||||||
role
|
|
||||||
avatar
|
|
||||||
}
|
|
||||||
branches(limit: $branch_limit) {
|
|
||||||
totalCount
|
|
||||||
cursor
|
|
||||||
items {
|
|
||||||
id
|
|
||||||
name
|
|
||||||
description
|
|
||||||
commits(limit: $commit_limit) {
|
|
||||||
totalCount
|
|
||||||
cursor
|
|
||||||
items {
|
|
||||||
id
|
|
||||||
referencedObject
|
|
||||||
message
|
|
||||||
authorName
|
|
||||||
authorId
|
|
||||||
createdAt
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
|
|
||||||
params = {"id": id, "branch_limit": branch_limit, "commit_limit": commit_limit}
|
|
||||||
|
|
||||||
return self.make_request(query=query, params=params, return_type="stream")
|
|
||||||
|
|
||||||
def list(self, stream_limit: int = 10) -> List[Stream]:
|
|
||||||
"""Get a list of the user's streams
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
stream_limit {int} -- The maximum number of streams to return
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
List[Stream] -- A list of Stream objects
|
|
||||||
"""
|
|
||||||
metrics.track(metrics.STREAM_LIST)
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
query User($stream_limit: Int!) {
|
|
||||||
user {
|
|
||||||
id
|
|
||||||
email
|
|
||||||
name
|
|
||||||
bio
|
|
||||||
company
|
|
||||||
avatar
|
|
||||||
verified
|
|
||||||
profiles
|
|
||||||
role
|
|
||||||
streams(limit: $stream_limit) {
|
|
||||||
totalCount
|
|
||||||
cursor
|
|
||||||
items {
|
|
||||||
id
|
|
||||||
name
|
|
||||||
description
|
|
||||||
isPublic
|
|
||||||
createdAt
|
|
||||||
updatedAt
|
|
||||||
collaborators {
|
|
||||||
id
|
|
||||||
name
|
|
||||||
role
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
|
|
||||||
params = {"stream_limit": stream_limit}
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query, params=params, return_type=["user", "streams", "items"]
|
|
||||||
)
|
|
||||||
|
|
||||||
def create(
|
|
||||||
self,
|
|
||||||
name: str = "Anonymous Python Stream",
|
|
||||||
description: str = "No description provided",
|
|
||||||
is_public: bool = True,
|
|
||||||
) -> str:
|
|
||||||
"""Create a new stream
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
name {str} -- the name of the string
|
|
||||||
description {str} -- a short description of the stream
|
|
||||||
is_public {bool} -- whether or not the stream can be viewed by anyone with the id
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
id {str} -- the id of the newly created stream
|
|
||||||
"""
|
|
||||||
metrics.track(metrics.STREAM_CREATE)
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
mutation StreamCreate($stream: StreamCreateInput!) {
|
|
||||||
streamCreate(stream: $stream)
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
|
|
||||||
params = {
|
|
||||||
"stream": {"name": name, "description": description, "isPublic": is_public}
|
|
||||||
}
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query, params=params, return_type="streamCreate", parse_response=False
|
|
||||||
)
|
|
||||||
|
|
||||||
def update(
|
|
||||||
self, id: str, name: str = None, description: str = None, is_public: bool = None
|
|
||||||
) -> bool:
|
|
||||||
"""Update an existing stream
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
id {str} -- the id of the stream to be updated
|
|
||||||
name {str} -- the name of the string
|
|
||||||
description {str} -- a short description of the stream
|
|
||||||
is_public {bool} -- whether or not the stream can be viewed by anyone with the id
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
bool -- whether the stream update was successful
|
|
||||||
"""
|
|
||||||
metrics.track(metrics.STREAM_UPDATE)
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
mutation StreamUpdate($stream: StreamUpdateInput!) {
|
|
||||||
streamUpdate(stream: $stream)
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
|
|
||||||
params = {
|
|
||||||
"id": id,
|
|
||||||
"name": name,
|
|
||||||
"description": description,
|
|
||||||
"isPublic": is_public,
|
|
||||||
}
|
|
||||||
# remove None values so graphql doesn't cry
|
|
||||||
params = {"stream": {k: v for k, v in params.items() if v is not None}}
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query, params=params, return_type="streamUpdate", parse_response=False
|
|
||||||
)
|
|
||||||
|
|
||||||
def delete(self, id: str) -> bool:
|
|
||||||
"""Delete a stream given its id
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
id {str} -- the id of the stream to delete
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
bool -- whether the deletion was successful
|
|
||||||
"""
|
|
||||||
metrics.track(metrics.STREAM_DELETE)
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
mutation StreamDelete($id: String!) {
|
|
||||||
streamDelete(id: $id)
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
|
|
||||||
params = {"id": id}
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query, params=params, return_type="streamDelete", parse_response=False
|
|
||||||
)
|
|
||||||
|
|
||||||
def search(
|
|
||||||
self,
|
|
||||||
search_query: str,
|
|
||||||
limit: int = 25,
|
|
||||||
branch_limit: int = 10,
|
|
||||||
commit_limit: int = 10,
|
|
||||||
):
|
|
||||||
"""Search for streams by name, description, or id
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
search_query {str} -- a string to search for
|
|
||||||
limit {int} -- the maximum number of results to return
|
|
||||||
branch_limit {int} -- the maximum number of branches to return
|
|
||||||
commit_limit {int} -- the maximum number of commits to return
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
List[Stream] -- a list of Streams that match the search query
|
|
||||||
"""
|
|
||||||
metrics.track(metrics.STREAM_SEARCH)
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
query StreamSearch($search_query: String!,$limit: Int!, $branch_limit:Int!, $commit_limit:Int!) {
|
|
||||||
streams(query: $search_query, limit: $limit) {
|
|
||||||
items {
|
|
||||||
id
|
|
||||||
name
|
|
||||||
description
|
|
||||||
isPublic
|
|
||||||
createdAt
|
|
||||||
updatedAt
|
|
||||||
collaborators {
|
|
||||||
id
|
|
||||||
name
|
|
||||||
role
|
|
||||||
avatar
|
|
||||||
}
|
|
||||||
branches(limit: $branch_limit) {
|
|
||||||
totalCount
|
|
||||||
cursor
|
|
||||||
items {
|
|
||||||
id
|
|
||||||
name
|
|
||||||
description
|
|
||||||
commits(limit: $commit_limit) {
|
|
||||||
totalCount
|
|
||||||
cursor
|
|
||||||
items {
|
|
||||||
id
|
|
||||||
referencedObject
|
|
||||||
message
|
|
||||||
authorName
|
|
||||||
authorId
|
|
||||||
createdAt
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
|
|
||||||
params = {
|
|
||||||
"search_query": search_query,
|
|
||||||
"limit": limit,
|
|
||||||
"branch_limit": branch_limit,
|
|
||||||
"commit_limit": commit_limit,
|
|
||||||
}
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query, params=params, return_type=["streams", "items"]
|
|
||||||
)
|
|
||||||
|
|
||||||
def grant_permission(self, stream_id: str, user_id: str, role: str):
|
|
||||||
"""Grant permissions to a user on a given stream
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
stream_id {str} -- the id of the stream to grant permissions to
|
|
||||||
user_id {str} -- the id of the user to grant permissions for
|
|
||||||
role {str} -- the role to grant the user
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
bool -- True if the operation was successful
|
|
||||||
"""
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
mutation StreamGrantPermission($permission_params: StreamGrantPermissionInput !) {
|
|
||||||
streamGrantPermission(permissionParams: $permission_params)
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
|
|
||||||
params = {
|
|
||||||
"permission_params": {
|
|
||||||
"streamId": stream_id,
|
|
||||||
"userId": user_id,
|
|
||||||
"role": role,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query,
|
|
||||||
params=params,
|
|
||||||
return_type="streamGrantPermission",
|
|
||||||
parse_response=False,
|
|
||||||
)
|
|
||||||
|
|
||||||
def revoke_permission(self, stream_id: str, user_id: str):
|
|
||||||
"""Revoke permissions from a user on a given stream
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
stream_id {str} -- the id of the stream to revoke permissions from
|
|
||||||
user_id {str} -- the id of the user to revoke permissions from
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
bool -- True if the operation was successful
|
|
||||||
"""
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
mutation StreamRevokePermission($permission_params: StreamRevokePermissionInput !) {
|
|
||||||
streamRevokePermission(permissionParams: $permission_params)
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
|
|
||||||
params = {"permission_params": {"streamId": stream_id, "userId": user_id}}
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query,
|
|
||||||
params=params,
|
|
||||||
return_type="streamRevokePermission",
|
|
||||||
parse_response=False,
|
|
||||||
)
|
|
||||||
@@ -1,125 +0,0 @@
|
|||||||
from typing import Callable, Dict, List, Optional, Any
|
|
||||||
from functools import wraps
|
|
||||||
from gql import gql
|
|
||||||
from specklepy.api.resource import ResourceBase
|
|
||||||
from specklepy.api.resources.stream import Stream
|
|
||||||
from specklepy.logging.exceptions import GraphQLException, SpeckleException
|
|
||||||
|
|
||||||
NAME = "subscribe"
|
|
||||||
METHODS = [
|
|
||||||
"stream_added",
|
|
||||||
"stream_updated",
|
|
||||||
"stream_removed",
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
def check_wsclient(function):
|
|
||||||
@wraps(function)
|
|
||||||
async def check_wsclient_wrapper(self, *args, **kwargs):
|
|
||||||
if self.client is None:
|
|
||||||
raise SpeckleException(
|
|
||||||
"You must authenticate before you can subscribe to events"
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
return await function(self, *args, **kwargs)
|
|
||||||
|
|
||||||
return check_wsclient_wrapper
|
|
||||||
|
|
||||||
|
|
||||||
class Resource(ResourceBase):
|
|
||||||
"""API Access class for subscriptions"""
|
|
||||||
|
|
||||||
def __init__(self, me, basepath, client) -> None:
|
|
||||||
super().__init__(
|
|
||||||
me=me, basepath=basepath, client=client, name=NAME, methods=METHODS
|
|
||||||
)
|
|
||||||
|
|
||||||
@check_wsclient
|
|
||||||
async def stream_added(self, callback: Callable = None):
|
|
||||||
"""Subscribes to new stream added event for your profile. Use this to display an up-to-date list of streams.
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
callback {Callable[Stream]} -- a function that takes the updated stream as an argument and executes each time a stream is added
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Stream -- the update stream
|
|
||||||
"""
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
subscription { userStreamAdded }
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
return await self.subscribe(
|
|
||||||
query=query, callback=callback, return_type="userStreamAdded", schema=Stream
|
|
||||||
)
|
|
||||||
|
|
||||||
@check_wsclient
|
|
||||||
async def stream_updated(self, id: str, callback: Callable = None):
|
|
||||||
"""Subscribes to stream updated event. Use this in clients/components that pertain only to this stream.
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
id {str} -- the stream id of the stream to subscribe to
|
|
||||||
callback {Callable[Stream]} -- a function that takes the updated stream as an argument and executes each time the stream is updated
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Stream -- the update stream
|
|
||||||
"""
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
subscription Update($id: String!) { streamUpdated(streamId: $id) }
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
params = {"id": id}
|
|
||||||
|
|
||||||
return await self.subscribe(
|
|
||||||
query=query,
|
|
||||||
params=params,
|
|
||||||
callback=callback,
|
|
||||||
return_type="streamUpdated",
|
|
||||||
schema=Stream,
|
|
||||||
)
|
|
||||||
|
|
||||||
@check_wsclient
|
|
||||||
async def stream_removed(self, callback: Callable = None):
|
|
||||||
"""Subscribes to stream removed event for your profile. Use this to display an up-to-date list of streams for your profile. NOTE: If someone revokes your permissions on a stream, this subscription will be triggered with an extra value of revokedBy in the payload.
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
callback {Callable[Dict]} -- a function that takes the returned dict as an argument and executes each time a stream is removed
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
dict -- dict containing 'id' of stream removed and optionally 'revokedBy'
|
|
||||||
"""
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
subscription { userStreamRemoved }
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
|
|
||||||
return await self.subscribe(
|
|
||||||
query=query,
|
|
||||||
callback=callback,
|
|
||||||
return_type="userStreamRemoved",
|
|
||||||
parse_response=False,
|
|
||||||
)
|
|
||||||
|
|
||||||
@check_wsclient
|
|
||||||
async def subscribe(
|
|
||||||
self,
|
|
||||||
query: gql,
|
|
||||||
params: Dict = None,
|
|
||||||
callback: Callable = None,
|
|
||||||
return_type: str or List = None,
|
|
||||||
schema=None,
|
|
||||||
parse_response: bool = True,
|
|
||||||
):
|
|
||||||
# if self.client.transport.websocket is None:
|
|
||||||
# TODO: add multiple subs to the same ws connection
|
|
||||||
async with self.client as session:
|
|
||||||
async for res in session.subscribe(query, variable_values=params):
|
|
||||||
res = self._step_into_response(response=res, return_type=return_type)
|
|
||||||
if parse_response:
|
|
||||||
res = self._parse_response(response=res, schema=schema)
|
|
||||||
if callback is not None:
|
|
||||||
callback(res)
|
|
||||||
else:
|
|
||||||
return res
|
|
||||||
@@ -1,120 +0,0 @@
|
|||||||
from specklepy.logging.exceptions import SpeckleException
|
|
||||||
from typing import List, Optional
|
|
||||||
from gql import gql
|
|
||||||
from pydantic.main import BaseModel
|
|
||||||
from specklepy.api.resource import ResourceBase
|
|
||||||
from specklepy.api.models import User
|
|
||||||
|
|
||||||
NAME = "user"
|
|
||||||
METHODS = ["get"]
|
|
||||||
|
|
||||||
|
|
||||||
class Resource(ResourceBase):
|
|
||||||
"""API Access class for users"""
|
|
||||||
|
|
||||||
def __init__(self, me, basepath, client) -> None:
|
|
||||||
super().__init__(
|
|
||||||
me=me, basepath=basepath, client=client, name=NAME, methods=METHODS
|
|
||||||
)
|
|
||||||
self.schema = User
|
|
||||||
|
|
||||||
def get(self, id: str = None) -> User:
|
|
||||||
"""Gets the profile of a user. If no id argument is provided, will return the current authenticated user's profile (as extracted from the authorization header).
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
id {str} -- the user id
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
User -- the retrieved user
|
|
||||||
"""
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
query User($id: String) {
|
|
||||||
user(id: $id) {
|
|
||||||
id
|
|
||||||
email
|
|
||||||
name
|
|
||||||
bio
|
|
||||||
company
|
|
||||||
avatar
|
|
||||||
verified
|
|
||||||
profiles
|
|
||||||
role
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
|
|
||||||
params = {"id": id}
|
|
||||||
|
|
||||||
return self.make_request(query=query, params=params, return_type="user")
|
|
||||||
|
|
||||||
def search(self, search_query: str, limit: int = 25) -> List[User]:
|
|
||||||
"""Searches for user by name or email. The search query must be at least 3 characters long
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
search_query {str} -- a string to search for
|
|
||||||
limit {int} -- the maximum number of results to return
|
|
||||||
Returns:
|
|
||||||
List[User] -- a list of User objects that match the search query
|
|
||||||
"""
|
|
||||||
if len(search_query) < 3:
|
|
||||||
return SpeckleException(
|
|
||||||
message="User search query must be at least 3 characters"
|
|
||||||
)
|
|
||||||
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
query UserSearch($search_query: String!, $limit: Int!) {
|
|
||||||
userSearch(query: $search_query, limit: $limit) {
|
|
||||||
items {
|
|
||||||
id
|
|
||||||
name
|
|
||||||
bio
|
|
||||||
company
|
|
||||||
avatar
|
|
||||||
verified
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
params = {"search_query": search_query, "limit": limit}
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query, params=params, return_type=["userSearch", "items"]
|
|
||||||
)
|
|
||||||
|
|
||||||
def update(
|
|
||||||
self, name: str = None, company: str = None, bio: str = None, avatar: str = None
|
|
||||||
):
|
|
||||||
"""Updates your user profile. All arguments are optional.
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
name {str} -- your name
|
|
||||||
company {str} -- the company you may or may not work for
|
|
||||||
bio {str} -- tell us about yourself
|
|
||||||
avatar {str} -- a nice photo of yourself
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
bool -- True if your profile was updated successfully
|
|
||||||
"""
|
|
||||||
query = gql(
|
|
||||||
"""
|
|
||||||
mutation UserUpdate($user: UserUpdateInput!) {
|
|
||||||
userUpdate(user: $user)
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
params = {"name": name, "company": company, "bio": bio, "avatar": avatar}
|
|
||||||
|
|
||||||
params = {"user": {k: v for k, v in params.items() if v is not None}}
|
|
||||||
|
|
||||||
if not params["user"]:
|
|
||||||
return SpeckleException(
|
|
||||||
message="You must provide at least one field to update your user profile"
|
|
||||||
)
|
|
||||||
|
|
||||||
return self.make_request(
|
|
||||||
query=query, params=params, return_type="userUpdate", parse_response=False
|
|
||||||
)
|
|
||||||
@@ -1,640 +0,0 @@
|
|||||||
|
|
||||||
|
|
||||||
scalar DateTime
|
|
||||||
|
|
||||||
scalar EmailAddress
|
|
||||||
|
|
||||||
scalar BigInt
|
|
||||||
|
|
||||||
scalar JSONObject
|
|
||||||
|
|
||||||
|
|
||||||
directive @hasScope(scope: String!) on FIELD_DEFINITION
|
|
||||||
directive @hasRole(role: String!) on FIELD_DEFINITION
|
|
||||||
|
|
||||||
type Query {
|
|
||||||
"""
|
|
||||||
Stare into the void.
|
|
||||||
"""
|
|
||||||
_: String
|
|
||||||
}
|
|
||||||
type Mutation{
|
|
||||||
"""
|
|
||||||
The void stares back.
|
|
||||||
"""
|
|
||||||
_: String
|
|
||||||
}
|
|
||||||
type Subscription{
|
|
||||||
"""
|
|
||||||
It's lonely in the void.
|
|
||||||
"""
|
|
||||||
_: String
|
|
||||||
},extend type Query {
|
|
||||||
"""
|
|
||||||
Gets a specific app from the server.
|
|
||||||
"""
|
|
||||||
app( id: String! ): ServerApp
|
|
||||||
|
|
||||||
"""
|
|
||||||
Returns all the publicly available apps on this server.
|
|
||||||
"""
|
|
||||||
apps: [ServerAppListItem]
|
|
||||||
}
|
|
||||||
|
|
||||||
type ServerApp {
|
|
||||||
id: String!
|
|
||||||
secret: String!
|
|
||||||
name: String!
|
|
||||||
description: String
|
|
||||||
termsAndConditionsLink: String
|
|
||||||
logo: String
|
|
||||||
public: Boolean
|
|
||||||
trustByDefault: Boolean
|
|
||||||
author: AppAuthor
|
|
||||||
createdAt: DateTime!
|
|
||||||
redirectUrl: String!
|
|
||||||
scopes: [Scope]!
|
|
||||||
}
|
|
||||||
|
|
||||||
type ServerAppListItem {
|
|
||||||
id: String!
|
|
||||||
name: String!
|
|
||||||
description: String
|
|
||||||
termsAndConditionsLink: String
|
|
||||||
logo: String
|
|
||||||
author: AppAuthor
|
|
||||||
}
|
|
||||||
|
|
||||||
type AppAuthor {
|
|
||||||
name: String
|
|
||||||
id: String
|
|
||||||
}
|
|
||||||
|
|
||||||
extend type User {
|
|
||||||
"""
|
|
||||||
Returns the apps you have authorized.
|
|
||||||
"""
|
|
||||||
authorizedApps: [ServerAppListItem]
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "apps:read")
|
|
||||||
|
|
||||||
"""
|
|
||||||
Returns the apps you have created.
|
|
||||||
"""
|
|
||||||
createdApps: [ServerAppListItem]
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "apps:read")
|
|
||||||
}
|
|
||||||
|
|
||||||
extend type Mutation {
|
|
||||||
"""
|
|
||||||
Register a new third party application.
|
|
||||||
"""
|
|
||||||
appCreate(app: AppCreateInput!): String!
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "apps:write")
|
|
||||||
|
|
||||||
"""
|
|
||||||
Update an existing third party application. **Note: This will invalidate all existing tokens, refresh tokens and access codes and will require existing users to re-authorize it.**
|
|
||||||
"""
|
|
||||||
appUpdate(app: AppUpdateInput!): Boolean!
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "apps:write")
|
|
||||||
|
|
||||||
"""
|
|
||||||
Deletes a thirty party application.
|
|
||||||
"""
|
|
||||||
appDelete(appId: String!): Boolean!
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "apps:write")
|
|
||||||
|
|
||||||
"""
|
|
||||||
Revokes (de-authorizes) an application that you have previously authorized.
|
|
||||||
"""
|
|
||||||
appRevokeAccess(appId: String!): Boolean
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "apps:write")
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
input AppCreateInput {
|
|
||||||
name: String!
|
|
||||||
description: String!
|
|
||||||
termsAndConditionsLink: String
|
|
||||||
logo: String
|
|
||||||
public: Boolean
|
|
||||||
redirectUrl: String!
|
|
||||||
scopes: [String]!
|
|
||||||
}
|
|
||||||
|
|
||||||
input AppUpdateInput {
|
|
||||||
id: String!
|
|
||||||
name: String!
|
|
||||||
description: String!
|
|
||||||
termsAndConditionsLink: String
|
|
||||||
logo: String
|
|
||||||
public: Boolean
|
|
||||||
redirectUrl: String!
|
|
||||||
scopes: [String]!
|
|
||||||
}
|
|
||||||
,extend type ServerInfo {
|
|
||||||
"""
|
|
||||||
The authentication strategies available on this server.
|
|
||||||
"""
|
|
||||||
authStrategies: [AuthStrategy]
|
|
||||||
}
|
|
||||||
|
|
||||||
type AuthStrategy {
|
|
||||||
id: String!,
|
|
||||||
name: String!,
|
|
||||||
icon: String!,
|
|
||||||
url: String!,
|
|
||||||
color: String
|
|
||||||
}
|
|
||||||
,extend type User{
|
|
||||||
"""
|
|
||||||
Returns a list of your personal api tokens.
|
|
||||||
"""
|
|
||||||
apiTokens: [ApiToken]
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "tokens:read")
|
|
||||||
}
|
|
||||||
|
|
||||||
type ApiToken {
|
|
||||||
id: String!
|
|
||||||
name: String!
|
|
||||||
lastChars: String!
|
|
||||||
scopes: [String]!
|
|
||||||
createdAt: DateTime! #date
|
|
||||||
lifespan: BigInt!
|
|
||||||
lastUsed: String! #date
|
|
||||||
}
|
|
||||||
|
|
||||||
input ApiTokenCreateInput {
|
|
||||||
scopes: [String!]!,
|
|
||||||
name: String!,
|
|
||||||
lifespan: BigInt
|
|
||||||
}
|
|
||||||
|
|
||||||
extend type Mutation {
|
|
||||||
"""
|
|
||||||
Creates an personal api token.
|
|
||||||
"""
|
|
||||||
apiTokenCreate(token: ApiTokenCreateInput!):String!
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "tokens:write")
|
|
||||||
"""
|
|
||||||
Revokes (deletes) an personal api token.
|
|
||||||
"""
|
|
||||||
apiTokenRevoke(token: String!):Boolean!
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "tokens:write")
|
|
||||||
}
|
|
||||||
,extend type Stream {
|
|
||||||
commits(limit: Int! = 25, cursor: String): CommitCollection
|
|
||||||
commit(id: String!): Commit
|
|
||||||
branches(limit: Int! = 25, cursor: String): BranchCollection
|
|
||||||
branch(name: String!): Branch
|
|
||||||
}
|
|
||||||
|
|
||||||
extend type User {
|
|
||||||
commits(limit: Int! = 25, cursor: String): CommitCollectionUser
|
|
||||||
}
|
|
||||||
|
|
||||||
type Branch {
|
|
||||||
id: String!
|
|
||||||
name: String!
|
|
||||||
author: User!
|
|
||||||
description: String
|
|
||||||
commits(limit: Int! = 25, cursor: String): CommitCollection
|
|
||||||
}
|
|
||||||
|
|
||||||
type Commit {
|
|
||||||
id: String!
|
|
||||||
referencedObject: String!
|
|
||||||
message: String
|
|
||||||
authorName: String
|
|
||||||
authorId: String
|
|
||||||
createdAt: DateTime
|
|
||||||
}
|
|
||||||
|
|
||||||
type CommitCollectionUserNode {
|
|
||||||
id: String!
|
|
||||||
referencedObject: String!
|
|
||||||
message: String
|
|
||||||
streamId: String
|
|
||||||
streamName: String
|
|
||||||
createdAt: DateTime
|
|
||||||
}
|
|
||||||
|
|
||||||
type BranchCollection {
|
|
||||||
totalCount: Int!
|
|
||||||
cursor: String
|
|
||||||
items: [Branch]
|
|
||||||
}
|
|
||||||
|
|
||||||
type CommitCollection {
|
|
||||||
totalCount: Int!
|
|
||||||
cursor: String
|
|
||||||
items: [Commit]
|
|
||||||
}
|
|
||||||
|
|
||||||
type CommitCollectionUser {
|
|
||||||
totalCount: Int!
|
|
||||||
cursor: String
|
|
||||||
items: [CommitCollectionUserNode]
|
|
||||||
}
|
|
||||||
|
|
||||||
extend type Mutation {
|
|
||||||
branchCreate(branch: BranchCreateInput!): String!
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "streams:write")
|
|
||||||
branchUpdate(branch: BranchUpdateInput!): Boolean!
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "streams:write")
|
|
||||||
branchDelete(branch: BranchDeleteInput!): Boolean!
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "streams:write")
|
|
||||||
|
|
||||||
commitCreate(commit: CommitCreateInput!): String!
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "streams:write")
|
|
||||||
commitUpdate(commit: CommitUpdateInput!): Boolean!
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "streams:write")
|
|
||||||
commitDelete(commit: CommitDeleteInput!): Boolean!
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "streams:write")
|
|
||||||
}
|
|
||||||
|
|
||||||
extend type Subscription {
|
|
||||||
# TODO: auth for these subscriptions
|
|
||||||
"""
|
|
||||||
Subscribe to branch created event
|
|
||||||
"""
|
|
||||||
branchCreated(streamId: String!): JSONObject
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "streams:read")
|
|
||||||
"""
|
|
||||||
Subscribe to branch updated event.
|
|
||||||
"""
|
|
||||||
branchUpdated(streamId: String!, branchId: String): JSONObject
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "streams:read")
|
|
||||||
"""
|
|
||||||
Subscribe to branch deleted event
|
|
||||||
"""
|
|
||||||
branchDeleted(streamId: String!): JSONObject
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "streams:read")
|
|
||||||
|
|
||||||
"""
|
|
||||||
Subscribe to commit created event
|
|
||||||
"""
|
|
||||||
commitCreated(streamId: String!): JSONObject
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "streams:read")
|
|
||||||
"""
|
|
||||||
Subscribe to commit updated event.
|
|
||||||
"""
|
|
||||||
commitUpdated(streamId: String!, commitId: String): JSONObject
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "streams:read")
|
|
||||||
"""
|
|
||||||
Subscribe to commit deleted event
|
|
||||||
"""
|
|
||||||
commitDeleted(streamId: String!): JSONObject
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "streams:read")
|
|
||||||
}
|
|
||||||
|
|
||||||
input BranchCreateInput {
|
|
||||||
streamId: String!
|
|
||||||
name: String!
|
|
||||||
description: String
|
|
||||||
}
|
|
||||||
|
|
||||||
input BranchUpdateInput {
|
|
||||||
streamId: String!
|
|
||||||
id: String!
|
|
||||||
name: String
|
|
||||||
description: String
|
|
||||||
}
|
|
||||||
|
|
||||||
input BranchDeleteInput {
|
|
||||||
streamId: String!
|
|
||||||
id: String!
|
|
||||||
}
|
|
||||||
|
|
||||||
input CommitCreateInput {
|
|
||||||
streamId: String!
|
|
||||||
branchName: String!
|
|
||||||
objectId: String!
|
|
||||||
message: String
|
|
||||||
previousCommitIds: [String]
|
|
||||||
}
|
|
||||||
|
|
||||||
input CommitUpdateInput {
|
|
||||||
streamId: String!
|
|
||||||
id: String!
|
|
||||||
message: String!
|
|
||||||
}
|
|
||||||
|
|
||||||
input CommitDeleteInput {
|
|
||||||
streamId: String!
|
|
||||||
id: String!
|
|
||||||
}
|
|
||||||
,extend type Stream {
|
|
||||||
object( id: String! ): Object
|
|
||||||
}
|
|
||||||
|
|
||||||
type Object {
|
|
||||||
id: String!
|
|
||||||
speckleType: String!
|
|
||||||
applicationId: String
|
|
||||||
createdAt: DateTime
|
|
||||||
totalChildrenCount: Int
|
|
||||||
"""
|
|
||||||
The full object, with all its props & other things. **NOTE:** If you're requesting objects for the purpose of recreating & displaying, you probably only want to request this specific field.
|
|
||||||
"""
|
|
||||||
data: JSONObject
|
|
||||||
"""
|
|
||||||
Get any objects that this object references. In the case of commits, this will give you a commit's constituent objects.
|
|
||||||
**NOTE**: Providing any of the two last arguments ( `query`, `orderBy` ) will trigger a different code branch that executes a much more expensive SQL query. It is not recommended to do so for basic clients that are interested in purely getting all the objects of a given commit.
|
|
||||||
"""
|
|
||||||
children(
|
|
||||||
limit: Int! = 100,
|
|
||||||
depth: Int! = 50,
|
|
||||||
select: [String],
|
|
||||||
cursor: String,
|
|
||||||
query: [JSONObject!],
|
|
||||||
orderBy: JSONObject ): ObjectCollection!
|
|
||||||
}
|
|
||||||
|
|
||||||
type ObjectCollection {
|
|
||||||
totalCount: Int!
|
|
||||||
cursor: String
|
|
||||||
objects: [Object]!
|
|
||||||
}
|
|
||||||
|
|
||||||
extend type Mutation {
|
|
||||||
objectCreate( objectInput: ObjectCreateInput! ): [String]!
|
|
||||||
}
|
|
||||||
|
|
||||||
input ObjectCreateInput {
|
|
||||||
"""
|
|
||||||
The stream against which these objects will be created.
|
|
||||||
"""
|
|
||||||
streamId: String!
|
|
||||||
"""
|
|
||||||
The objects you want to create.
|
|
||||||
"""
|
|
||||||
objects: [JSONObject]!
|
|
||||||
},extend type Query {
|
|
||||||
serverInfo: ServerInfo!
|
|
||||||
}
|
|
||||||
|
|
||||||
"""
|
|
||||||
Information about this server.
|
|
||||||
"""
|
|
||||||
type ServerInfo {
|
|
||||||
name: String!
|
|
||||||
company: String
|
|
||||||
description: String
|
|
||||||
adminContact: String
|
|
||||||
canonicalUrl: String
|
|
||||||
termsOfService: String
|
|
||||||
roles: [Role]!
|
|
||||||
scopes: [Scope]!
|
|
||||||
}
|
|
||||||
|
|
||||||
"""
|
|
||||||
Available roles.
|
|
||||||
"""
|
|
||||||
type Role {
|
|
||||||
name: String!
|
|
||||||
description: String!
|
|
||||||
resourceTarget: String!
|
|
||||||
}
|
|
||||||
|
|
||||||
"""
|
|
||||||
Available scopes.
|
|
||||||
"""
|
|
||||||
type Scope {
|
|
||||||
name: String!
|
|
||||||
description: String!
|
|
||||||
}
|
|
||||||
|
|
||||||
extend type Mutation {
|
|
||||||
serverInfoUpdate(info: ServerInfoUpdateInput!): Boolean
|
|
||||||
@hasRole(role: "server:admin")
|
|
||||||
@hasScope(scope: "server:setup")
|
|
||||||
}
|
|
||||||
|
|
||||||
input ServerInfoUpdateInput {
|
|
||||||
name: String!
|
|
||||||
company: String
|
|
||||||
description: String
|
|
||||||
adminContact: String
|
|
||||||
termsOfService: String
|
|
||||||
}
|
|
||||||
,extend type Query {
|
|
||||||
"""
|
|
||||||
Returns a specific stream.
|
|
||||||
"""
|
|
||||||
stream( id: String! ): Stream
|
|
||||||
|
|
||||||
"""
|
|
||||||
All the streams of the current user, pass in the `query` parameter to seach by name, description or ID.
|
|
||||||
"""
|
|
||||||
streams( query: String, limit: Int = 25, cursor: String ): StreamCollection
|
|
||||||
@hasScope(scope: "streams:read")
|
|
||||||
}
|
|
||||||
|
|
||||||
type Stream {
|
|
||||||
id: String!
|
|
||||||
name: String!
|
|
||||||
description: String
|
|
||||||
isPublic: Boolean!
|
|
||||||
createdAt: DateTime!
|
|
||||||
updatedAt: DateTime!
|
|
||||||
collaborators: [ StreamCollaborator ]!
|
|
||||||
}
|
|
||||||
|
|
||||||
extend type User {
|
|
||||||
"""
|
|
||||||
All the streams that a user has access to.
|
|
||||||
"""
|
|
||||||
streams( limit: Int! = 25, cursor: String ): StreamCollection
|
|
||||||
}
|
|
||||||
|
|
||||||
type StreamCollaborator {
|
|
||||||
id: String!
|
|
||||||
name: String!
|
|
||||||
role: String!
|
|
||||||
company: String
|
|
||||||
avatar: String
|
|
||||||
}
|
|
||||||
|
|
||||||
type StreamCollection {
|
|
||||||
totalCount: Int!
|
|
||||||
cursor: String
|
|
||||||
items: [ Stream ]
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
extend type Mutation {
|
|
||||||
"""
|
|
||||||
Creates a new stream.
|
|
||||||
"""
|
|
||||||
streamCreate( stream: StreamCreateInput! ): String
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "streams:write")
|
|
||||||
"""
|
|
||||||
Updates an existing stream.
|
|
||||||
"""
|
|
||||||
streamUpdate( stream: StreamUpdateInput! ): Boolean!
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "streams:write")
|
|
||||||
"""
|
|
||||||
Deletes an existing stream.
|
|
||||||
"""
|
|
||||||
streamDelete( id: String! ): Boolean!
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "streams:write")
|
|
||||||
"""
|
|
||||||
Grants permissions to a user on a given stream.
|
|
||||||
"""
|
|
||||||
streamGrantPermission( permissionParams: StreamGrantPermissionInput! ): Boolean
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "streams:write")
|
|
||||||
"""
|
|
||||||
Revokes the permissions of a user on a given stream.
|
|
||||||
"""
|
|
||||||
streamRevokePermission( permissionParams: StreamRevokePermissionInput! ): Boolean
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "streams:write")
|
|
||||||
}
|
|
||||||
|
|
||||||
extend type Subscription {
|
|
||||||
|
|
||||||
#
|
|
||||||
# User bound subscriptions that operate on the stream collection of an user
|
|
||||||
# Example relevant view/usecase: updating the list of streams for a user.
|
|
||||||
#
|
|
||||||
|
|
||||||
"""
|
|
||||||
Subscribes to new stream added event for your profile. Use this to display an up-to-date list of streams.
|
|
||||||
**NOTE**: If someone shares a stream with you, this subscription will be triggered with an extra value of `sharedBy` in the payload.
|
|
||||||
"""
|
|
||||||
userStreamAdded: JSONObject
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "profile:read")
|
|
||||||
|
|
||||||
"""
|
|
||||||
Subscribes to stream removed event for your profile. Use this to display an up-to-date list of streams for your profile.
|
|
||||||
**NOTE**: If someone revokes your permissions on a stream, this subscription will be triggered with an extra value of `revokedBy` in the payload.
|
|
||||||
"""
|
|
||||||
userStreamRemoved: JSONObject
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "profile:read")
|
|
||||||
|
|
||||||
#
|
|
||||||
# Stream bound subscriptions that operate on the stream itself.
|
|
||||||
# Example relevant view/usecase: a single stream connector, or view, or component in a web app
|
|
||||||
#
|
|
||||||
|
|
||||||
"""
|
|
||||||
Subscribes to stream updated event. Use this in clients/components that pertain only to this stream.
|
|
||||||
"""
|
|
||||||
streamUpdated( streamId: String ): JSONObject
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "streams:read")
|
|
||||||
|
|
||||||
"""
|
|
||||||
Subscribes to stream deleted event. Use this in clients/components that pertain only to this stream.
|
|
||||||
"""
|
|
||||||
streamDeleted( streamId: String ): JSONObject
|
|
||||||
@hasRole(role: "server:user")
|
|
||||||
@hasScope(scope: "streams:read")
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
input StreamCreateInput {
|
|
||||||
name: String
|
|
||||||
description: String
|
|
||||||
isPublic: Boolean
|
|
||||||
}
|
|
||||||
|
|
||||||
input StreamUpdateInput {
|
|
||||||
id: String!
|
|
||||||
name: String
|
|
||||||
description: String
|
|
||||||
isPublic: Boolean
|
|
||||||
}
|
|
||||||
|
|
||||||
input StreamGrantPermissionInput {
|
|
||||||
streamId: String!,
|
|
||||||
userId: String!,
|
|
||||||
role: String!
|
|
||||||
}
|
|
||||||
|
|
||||||
input StreamRevokePermissionInput {
|
|
||||||
streamId: String!,
|
|
||||||
userId: String!
|
|
||||||
}
|
|
||||||
,extend type Query {
|
|
||||||
"""
|
|
||||||
Gets the profile of a user. If no id argument is provided, will return the current authenticated user's profile (as extracted from the authorization header).
|
|
||||||
"""
|
|
||||||
user(id: String): User
|
|
||||||
userSearch(
|
|
||||||
query: String!
|
|
||||||
limit: Int! = 25
|
|
||||||
cursor: String
|
|
||||||
): UserSearchResultCollection
|
|
||||||
userPwdStrength(pwd: String!): JSONObject
|
|
||||||
}
|
|
||||||
|
|
||||||
"""
|
|
||||||
Base user type.
|
|
||||||
"""
|
|
||||||
type User {
|
|
||||||
id: String!
|
|
||||||
suuid: String
|
|
||||||
email: String
|
|
||||||
name: String
|
|
||||||
bio: String
|
|
||||||
company: String
|
|
||||||
avatar: String
|
|
||||||
verified: Boolean
|
|
||||||
profiles: JSONObject
|
|
||||||
role: String
|
|
||||||
}
|
|
||||||
|
|
||||||
type UserSearchResultCollection {
|
|
||||||
cursor: String
|
|
||||||
items: [UserSearchResult]
|
|
||||||
}
|
|
||||||
|
|
||||||
type UserSearchResult {
|
|
||||||
id: String!
|
|
||||||
name: String
|
|
||||||
bio: String
|
|
||||||
company: String
|
|
||||||
avatar: String
|
|
||||||
verified: Boolean
|
|
||||||
}
|
|
||||||
|
|
||||||
extend type Mutation {
|
|
||||||
"""
|
|
||||||
Edits a user's profile.
|
|
||||||
"""
|
|
||||||
userUpdate(user: UserUpdateInput!): Boolean!
|
|
||||||
}
|
|
||||||
|
|
||||||
input UserUpdateInput {
|
|
||||||
name: String
|
|
||||||
company: String
|
|
||||||
bio: String
|
|
||||||
}
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
from typing import Any, List
|
|
||||||
|
|
||||||
|
|
||||||
class SpeckleException(Exception):
|
|
||||||
def __init__(self, message: str, exception: Exception = None) -> None:
|
|
||||||
self.message = message
|
|
||||||
self.exception = exception
|
|
||||||
|
|
||||||
def __str__(self) -> str:
|
|
||||||
return f"SpeckleException: {self.message}"
|
|
||||||
|
|
||||||
|
|
||||||
class SerializationException(SpeckleException):
|
|
||||||
def __init__(self, message: str, object: Any, exception: Exception = None) -> None:
|
|
||||||
super().__init__(message=message)
|
|
||||||
self.object = object
|
|
||||||
self.unhandled_type = type(object)
|
|
||||||
|
|
||||||
def __str__(self) -> str:
|
|
||||||
return f"SpeckleException: Could not serialize object of type {self.unhandled_type}"
|
|
||||||
|
|
||||||
|
|
||||||
class GraphQLException(SpeckleException):
|
|
||||||
def __init__(self, message: str, errors: List, data=None) -> None:
|
|
||||||
super().__init__(message=message)
|
|
||||||
self.errors = errors
|
|
||||||
self.data = data
|
|
||||||
|
|
||||||
def __str__(self) -> str:
|
|
||||||
return f"GraphQLException: {self.message}"
|
|
||||||
|
|
||||||
|
|
||||||
class SpeckleWarning(Warning):
|
|
||||||
def __init__(self, *args: object) -> None:
|
|
||||||
super().__init__(*args)
|
|
||||||
@@ -1,125 +0,0 @@
|
|||||||
import os
|
|
||||||
import queue
|
|
||||||
import logging
|
|
||||||
import requests
|
|
||||||
import threading
|
|
||||||
from requests.sessions import session
|
|
||||||
from specklepy.transports.sqlite import SQLiteTransport
|
|
||||||
|
|
||||||
"""
|
|
||||||
Anonymous telemetry to help us understand how to make a better Speckle.
|
|
||||||
This really helps us to deliver a better open source project and product!
|
|
||||||
"""
|
|
||||||
TRACK = True
|
|
||||||
HOST_APP = "python"
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
METRICS_TRACKER = None
|
|
||||||
|
|
||||||
# actions
|
|
||||||
RECEIVE = "receive"
|
|
||||||
SEND = "send"
|
|
||||||
STREAM_CREATE = "stream/create"
|
|
||||||
STREAM_GET = "stream/get"
|
|
||||||
STREAM_UPDATE = "stream/update"
|
|
||||||
STREAM_DELETE = "stream/delete"
|
|
||||||
STREAM_DETAILS = "stream/details"
|
|
||||||
STREAM_LIST = "stream/list"
|
|
||||||
STREAM_VIEW = "stream/view"
|
|
||||||
STREAM_SEARCH = "stream/search"
|
|
||||||
|
|
||||||
ACCOUNT_DEFAULT = "account/default"
|
|
||||||
ACCOUNT_DETAILS = "account/details"
|
|
||||||
ACCOUNT_LIST = "account/list"
|
|
||||||
|
|
||||||
SERIALIZE = "serialization/serialize"
|
|
||||||
DESERIALIZE = "serialization/deserialize"
|
|
||||||
|
|
||||||
|
|
||||||
def disable():
|
|
||||||
global TRACK
|
|
||||||
TRACK = False
|
|
||||||
|
|
||||||
|
|
||||||
def set_host_app(host_app: str):
|
|
||||||
global HOST_APP
|
|
||||||
HOST_APP = host_app
|
|
||||||
|
|
||||||
|
|
||||||
def track(action: str):
|
|
||||||
if not TRACK:
|
|
||||||
return
|
|
||||||
try:
|
|
||||||
global METRICS_TRACKER
|
|
||||||
if not METRICS_TRACKER:
|
|
||||||
METRICS_TRACKER = MetricsTracker()
|
|
||||||
|
|
||||||
page_params = {
|
|
||||||
"rec": 1,
|
|
||||||
"idsite": METRICS_TRACKER.site_id,
|
|
||||||
"uid": METRICS_TRACKER.suuid,
|
|
||||||
"action_name": action,
|
|
||||||
"url": f"http://connectors/{HOST_APP}/{action}",
|
|
||||||
"urlref": f"http://connectors/{HOST_APP}/{action}",
|
|
||||||
"_cvar": {"1": ["hostApplication", HOST_APP]},
|
|
||||||
}
|
|
||||||
|
|
||||||
event_params = {
|
|
||||||
"rec": 1,
|
|
||||||
"idsite": METRICS_TRACKER.site_id,
|
|
||||||
"uid": MetricsTracker.suuid,
|
|
||||||
"_cvar": {"1": ["hostApplication", HOST_APP]},
|
|
||||||
"e_c": HOST_APP,
|
|
||||||
"e_a": action,
|
|
||||||
}
|
|
||||||
|
|
||||||
METRICS_TRACKER.queue.put_nowait([event_params, page_params])
|
|
||||||
except Exception as ex:
|
|
||||||
# wrapping this whole thing in a try except as we never want a failure here to annoy users!
|
|
||||||
LOG.error("Error queueing metrics request: " + str(ex))
|
|
||||||
|
|
||||||
|
|
||||||
class Singleton(type):
|
|
||||||
_instances = {}
|
|
||||||
|
|
||||||
def __call__(cls, *args, **kwargs):
|
|
||||||
if cls not in cls._instances:
|
|
||||||
cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs)
|
|
||||||
return cls._instances[cls]
|
|
||||||
|
|
||||||
|
|
||||||
class MetricsTracker(metaclass=Singleton):
|
|
||||||
matomo_url = "https://speckle.matomo.cloud/matomo.php"
|
|
||||||
site_id = 2
|
|
||||||
host_app = "python"
|
|
||||||
suuid = None
|
|
||||||
sending_thread = None
|
|
||||||
queue = queue.Queue(1000)
|
|
||||||
|
|
||||||
def __init__(self) -> None:
|
|
||||||
self.sending_thread = threading.Thread(
|
|
||||||
target=self._send_tracking_requests, daemon=True
|
|
||||||
)
|
|
||||||
self.set_suuid()
|
|
||||||
self.sending_thread.start()
|
|
||||||
|
|
||||||
def set_suuid(self):
|
|
||||||
try:
|
|
||||||
file_path = os.path.join(SQLiteTransport.get_base_path("Speckle"), "suuid")
|
|
||||||
with open(file_path, "r") as file:
|
|
||||||
self.suuid = file.read()
|
|
||||||
except:
|
|
||||||
self.suuid = "unknown-suuid"
|
|
||||||
|
|
||||||
def _send_tracking_requests(self):
|
|
||||||
session = requests.Session()
|
|
||||||
while True:
|
|
||||||
params = self.queue.get()
|
|
||||||
|
|
||||||
try:
|
|
||||||
session.post(self.matomo_url, params=params[0])
|
|
||||||
session.post(self.matomo_url, params=params[1])
|
|
||||||
except Exception as ex:
|
|
||||||
LOG.error("Error sending metrics request: " + str(ex))
|
|
||||||
|
|
||||||
self.queue.task_done()
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
"""Builtin Speckle object kit."""
|
|
||||||
|
|
||||||
from specklepy.objects.base import Base
|
|
||||||
|
|
||||||
__all__ = ["Base"]
|
|
||||||
@@ -1,136 +0,0 @@
|
|||||||
from enum import Enum
|
|
||||||
from typing import Any, Callable, List, Type
|
|
||||||
|
|
||||||
from specklepy.logging.exceptions import SpeckleException
|
|
||||||
from specklepy.objects.base import Base
|
|
||||||
|
|
||||||
|
|
||||||
class CurveTypeEncoding(int, Enum):
|
|
||||||
Arc = 0
|
|
||||||
Circle = 1
|
|
||||||
Curve = 2
|
|
||||||
Ellipse = 3
|
|
||||||
Line = 4
|
|
||||||
Polyline = 5
|
|
||||||
Polycurve = 6
|
|
||||||
|
|
||||||
@property
|
|
||||||
def object_class(self) -> Type:
|
|
||||||
from . import geometry
|
|
||||||
|
|
||||||
if self == self.Arc:
|
|
||||||
return geometry.Arc
|
|
||||||
elif self == self.Circle:
|
|
||||||
return geometry.Circle
|
|
||||||
elif self == self.Curve:
|
|
||||||
return geometry.Curve
|
|
||||||
elif self == self.Ellipse:
|
|
||||||
return geometry.Ellipse
|
|
||||||
elif self == self.Line:
|
|
||||||
return geometry.Line
|
|
||||||
elif self == self.Polyline:
|
|
||||||
return geometry.Polyline
|
|
||||||
elif self == self.Polycurve:
|
|
||||||
return geometry.Polycurve
|
|
||||||
raise SpeckleException(
|
|
||||||
f"No corresponding object class for CurveTypeEncoding: {self}"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def curve_from_list(args: List[float]):
|
|
||||||
curve_type = CurveTypeEncoding(args[0])
|
|
||||||
return curve_type.object_class.from_list(args)
|
|
||||||
|
|
||||||
|
|
||||||
class ObjectArray:
|
|
||||||
def __init__(self) -> None:
|
|
||||||
self.data = []
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_objects(cls, objects: List[Base]) -> "ObjectArray":
|
|
||||||
data_list = cls()
|
|
||||||
if not objects:
|
|
||||||
return data_list
|
|
||||||
|
|
||||||
speckle_type = objects[0].speckle_type
|
|
||||||
|
|
||||||
for obj in objects:
|
|
||||||
if speckle_type != obj.speckle_type:
|
|
||||||
raise SpeckleException(
|
|
||||||
"All objects in chunk should have the same speckle_type. "
|
|
||||||
f"Found {speckle_type} and {obj.speckle_type}"
|
|
||||||
)
|
|
||||||
data_list.encode_object(object=obj)
|
|
||||||
|
|
||||||
return data_list
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def decode_data(
|
|
||||||
data: List[Any], decoder: Callable[[List[Any]], Base]
|
|
||||||
) -> List[Base]:
|
|
||||||
bases = []
|
|
||||||
if not data:
|
|
||||||
return bases
|
|
||||||
|
|
||||||
index = 0
|
|
||||||
while index < len(data):
|
|
||||||
item_length = data[index]
|
|
||||||
item_start = index + 1
|
|
||||||
item_end = item_start + item_length
|
|
||||||
item_data = data[item_start:item_end]
|
|
||||||
index = item_end
|
|
||||||
# TODO: investigate what's going on w this fail
|
|
||||||
try:
|
|
||||||
decoded_data = decoder(item_data)
|
|
||||||
bases.append(decoded_data)
|
|
||||||
except ValueError:
|
|
||||||
continue
|
|
||||||
return bases
|
|
||||||
|
|
||||||
def decode(self, decoder: Callable[[List[Any]], Any]):
|
|
||||||
return self.decode_data(data=self.data, decoder=decoder)
|
|
||||||
|
|
||||||
def encode_object(self, object: Base):
|
|
||||||
encoded = object.to_list()
|
|
||||||
encoded.insert(0, len(encoded))
|
|
||||||
self.data.extend(encoded)
|
|
||||||
|
|
||||||
|
|
||||||
class CurveArray(ObjectArray):
|
|
||||||
@classmethod
|
|
||||||
def from_curve(cls, curve: Base) -> "CurveArray":
|
|
||||||
crv_array = cls()
|
|
||||||
crv_array.data = curve.to_list()
|
|
||||||
return crv_array
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_curves(cls, curves: List[Base]) -> "CurveArray":
|
|
||||||
data = []
|
|
||||||
for curve in curves:
|
|
||||||
curve_list = curve.to_list()
|
|
||||||
curve_list.insert(0, len(curve_list))
|
|
||||||
data.extend(curve_list)
|
|
||||||
crv_array = cls()
|
|
||||||
crv_array.data = data
|
|
||||||
return crv_array
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def curve_from_list(args: List[float]) -> Base:
|
|
||||||
curve_type = CurveTypeEncoding(args[0])
|
|
||||||
return curve_type.object_class.from_list(args)
|
|
||||||
|
|
||||||
@property
|
|
||||||
def type(self) -> CurveTypeEncoding:
|
|
||||||
return CurveTypeEncoding(self.data[0])
|
|
||||||
|
|
||||||
def to_curve(self) -> Base:
|
|
||||||
return self.type.object_class.from_list(self.data)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def _curve_decoder(cls, data: List[float]) -> Base:
|
|
||||||
crv_array = cls()
|
|
||||||
crv_array.data = data
|
|
||||||
return crv_array.to_curve()
|
|
||||||
|
|
||||||
def to_curves(self) -> List[Base]:
|
|
||||||
return self.decode(decoder=self._curve_decoder)
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
from specklepy.objects.geometry import Point
|
|
||||||
from typing import List
|
|
||||||
|
|
||||||
from .base import Base
|
|
||||||
|
|
||||||
CHUNKABLE_PROPS = {
|
|
||||||
"vertices": 100,
|
|
||||||
"faces": 100,
|
|
||||||
"colors": 100,
|
|
||||||
"textureCoordinates": 100,
|
|
||||||
"test_bases": 10,
|
|
||||||
}
|
|
||||||
|
|
||||||
DETACHABLE = {"detach_this", "origin", "detached_list"}
|
|
||||||
|
|
||||||
|
|
||||||
class FakeGeo(Base, chunkable={"dots": 50}, detachable={"pointslist"}):
|
|
||||||
pointslist: List[Base] = None
|
|
||||||
dots: List[int] = None
|
|
||||||
|
|
||||||
|
|
||||||
class FakeMesh(FakeGeo, chunkable=CHUNKABLE_PROPS, detachable=DETACHABLE):
|
|
||||||
vertices: List[float] = None
|
|
||||||
faces: List[int] = None
|
|
||||||
colors: List[int] = None
|
|
||||||
textureCoordinates: List[float] = None
|
|
||||||
test_bases: List[Base] = None
|
|
||||||
detach_this: Base = None
|
|
||||||
detached_list: List[Base] = None
|
|
||||||
_origin: Point = None
|
|
||||||
|
|
||||||
# def __init__(self, **kwargs) -> None:
|
|
||||||
# super(FakeMesh, self).__init__(**kwargs)
|
|
||||||
# self.add_chunkable_attrs(**CHUNKABLE_PROPS)
|
|
||||||
# self.add_detachable_attrs(DETACHABLE)
|
|
||||||
|
|
||||||
@property
|
|
||||||
def origin(self):
|
|
||||||
return self._origin
|
|
||||||
|
|
||||||
@origin.setter
|
|
||||||
def origin(self, value: Point):
|
|
||||||
self._origin = value
|
|
||||||
@@ -1,735 +0,0 @@
|
|||||||
from enum import Enum
|
|
||||||
from typing import Any, List, Optional
|
|
||||||
|
|
||||||
from .base import Base
|
|
||||||
from .encoding import CurveArray, CurveTypeEncoding, ObjectArray
|
|
||||||
from .units import get_encoding_from_units, get_units_from_encoding
|
|
||||||
|
|
||||||
GEOMETRY = "Objects.Geometry."
|
|
||||||
|
|
||||||
|
|
||||||
class Interval(Base, speckle_type="Objects.Primitive.Interval"):
|
|
||||||
start: float = 0.0
|
|
||||||
end: float = 0.0
|
|
||||||
|
|
||||||
def length(self):
|
|
||||||
return abs(self.start - self.end)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_list(cls, args: List[Any]) -> "Interval":
|
|
||||||
return cls(start=args[0], end=args[1])
|
|
||||||
|
|
||||||
def to_list(self) -> List[Any]:
|
|
||||||
return [self.start, self.end]
|
|
||||||
|
|
||||||
|
|
||||||
class Point(Base, speckle_type=GEOMETRY + "Point"):
|
|
||||||
x: float = 0.0
|
|
||||||
y: float = 0.0
|
|
||||||
z: float = 0.0
|
|
||||||
|
|
||||||
def __repr__(self) -> str:
|
|
||||||
return f"{self.__class__.__name__}(x: {self.x}, y: {self.y}, z: {self.z}, id: {self.id}, speckle_type: {self.speckle_type})"
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_list(cls, args: List[float]) -> "Point":
|
|
||||||
return cls(x=args[0], y=args[1], z=args[2])
|
|
||||||
|
|
||||||
def to_list(self) -> List[Any]:
|
|
||||||
return [self.x, self.y, self.z]
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_coords(cls, x: float = 0.0, y: float = 0.0, z: float = 0.0):
|
|
||||||
pt = Point()
|
|
||||||
pt.x, pt.y, pt.z = x, y, z
|
|
||||||
return pt
|
|
||||||
|
|
||||||
|
|
||||||
class Vector(Point, speckle_type=GEOMETRY + "Vector"):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class ControlPoint(Point, speckle_type=GEOMETRY + "ControlPoint"):
|
|
||||||
weight: float = None
|
|
||||||
|
|
||||||
|
|
||||||
class Plane(Base, speckle_type=GEOMETRY + "Plane"):
|
|
||||||
origin: Point = Point()
|
|
||||||
normal: Vector = Vector()
|
|
||||||
xdir: Vector = Vector()
|
|
||||||
ydir: Vector = Vector()
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_list(cls, args: List[Any]) -> "Plane":
|
|
||||||
return cls(
|
|
||||||
origin=Point.from_list(args[0:3]),
|
|
||||||
normal=Vector.from_list(args[3:6]),
|
|
||||||
xdir=Vector.from_list(args[6:9]),
|
|
||||||
ydir=Vector.from_list(args[9:12]),
|
|
||||||
)
|
|
||||||
|
|
||||||
def to_list(self) -> List[Any]:
|
|
||||||
encoded = []
|
|
||||||
encoded.extend(self.origin.to_list())
|
|
||||||
encoded.extend(self.normal.to_list())
|
|
||||||
encoded.extend(self.xdir.to_list())
|
|
||||||
encoded.extend(self.ydir.to_list())
|
|
||||||
return encoded
|
|
||||||
|
|
||||||
|
|
||||||
class Box(Base, speckle_type=GEOMETRY + "Box"):
|
|
||||||
basePlane: Plane = Plane()
|
|
||||||
ySize: Interval = Interval()
|
|
||||||
zSize: Interval = Interval()
|
|
||||||
xSize: Interval = Interval()
|
|
||||||
area: float = None
|
|
||||||
volume: float = None
|
|
||||||
|
|
||||||
|
|
||||||
class Line(Base, speckle_type=GEOMETRY + "Line"):
|
|
||||||
start: Point = Point()
|
|
||||||
end: Point = None
|
|
||||||
domain: Interval = None
|
|
||||||
bbox: Box = None
|
|
||||||
length: float = None
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_list(cls, args: List[Any]) -> "Line":
|
|
||||||
return cls(
|
|
||||||
start=Point.from_list(args[0:3]),
|
|
||||||
end=Point.from_list(args[3:6]),
|
|
||||||
domain=Interval.from_list(args[6:9]),
|
|
||||||
)
|
|
||||||
|
|
||||||
def to_list(self) -> List[Any]:
|
|
||||||
encoded = []
|
|
||||||
encoded.extend(self.start.to_list())
|
|
||||||
encoded.extend(self.end.to_list())
|
|
||||||
encoded.extend(self.domain.to_list())
|
|
||||||
return encoded
|
|
||||||
|
|
||||||
|
|
||||||
class Arc(Base, speckle_type=GEOMETRY + "Arc"):
|
|
||||||
radius: float = None
|
|
||||||
startAngle: float = None
|
|
||||||
endAngle: float = None
|
|
||||||
angleRadians: float = None
|
|
||||||
plane: Plane = None
|
|
||||||
domain: Interval = None
|
|
||||||
startPoint: Point = None
|
|
||||||
midPoint: Point = None
|
|
||||||
endPoint: Point = None
|
|
||||||
bbox: Box = None
|
|
||||||
area: float = None
|
|
||||||
length: float = None
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_list(cls, args: List[Any]) -> "Arc":
|
|
||||||
return cls(
|
|
||||||
radius=args[1],
|
|
||||||
startAngle=args[2],
|
|
||||||
endAngle=args[3],
|
|
||||||
angleRadians=args[4],
|
|
||||||
domain=Interval.from_list(args[5:7]),
|
|
||||||
plane=Plane.from_list(args[7:20]),
|
|
||||||
units=get_units_from_encoding(args[-1]),
|
|
||||||
)
|
|
||||||
|
|
||||||
def to_list(self) -> List[Any]:
|
|
||||||
encoded = []
|
|
||||||
encoded.append(CurveTypeEncoding.Arc.value)
|
|
||||||
encoded.append(self.radius)
|
|
||||||
encoded.append(self.startAngle)
|
|
||||||
encoded.append(self.endAngle)
|
|
||||||
encoded.append(self.angleRadians)
|
|
||||||
encoded.extend(self.domain.to_list())
|
|
||||||
encoded.extend(self.plane.to_list())
|
|
||||||
encoded.append(get_encoding_from_units(self.units))
|
|
||||||
return encoded
|
|
||||||
|
|
||||||
|
|
||||||
class Circle(Base, speckle_type=GEOMETRY + "Circle"):
|
|
||||||
radius: float = None
|
|
||||||
plane: Plane = None
|
|
||||||
domain: Interval = None
|
|
||||||
bbox: Box = None
|
|
||||||
area: float = None
|
|
||||||
length: float = None
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_list(cls, args: List[Any]) -> "Circle":
|
|
||||||
return cls(
|
|
||||||
radius=args[1],
|
|
||||||
domain=Interval.from_list(args[2:4]),
|
|
||||||
plane=Plane.from_list(args[4:17]),
|
|
||||||
units=get_units_from_encoding(args[-1]),
|
|
||||||
)
|
|
||||||
|
|
||||||
def to_list(self) -> List[Any]:
|
|
||||||
encoded = []
|
|
||||||
encoded.append(CurveTypeEncoding.Circle.value)
|
|
||||||
encoded.append(self.radius),
|
|
||||||
encoded.extend(self.domain.to_list())
|
|
||||||
encoded.extend(self.plane.to_list())
|
|
||||||
encoded.append(get_encoding_from_units(self.units))
|
|
||||||
return encoded
|
|
||||||
|
|
||||||
|
|
||||||
class Ellipse(Base, speckle_type=GEOMETRY + "Ellipse"):
|
|
||||||
firstRadius: float = None
|
|
||||||
secondRadius: float = None
|
|
||||||
plane: Plane = None
|
|
||||||
domain: Interval = None
|
|
||||||
trimDomain: Interval = None
|
|
||||||
bbox: Box = None
|
|
||||||
area: float = None
|
|
||||||
length: float = None
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_list(cls, args: List[Any]) -> "Ellipse":
|
|
||||||
return cls(
|
|
||||||
firstRadius=args[1],
|
|
||||||
secondRadius=args[2],
|
|
||||||
domain=Interval.from_list(args[3:5]),
|
|
||||||
plane=Plane.from_list(args[5:18]),
|
|
||||||
units=get_units_from_encoding(args[-1]),
|
|
||||||
)
|
|
||||||
|
|
||||||
def to_list(self) -> List[Any]:
|
|
||||||
encoded = []
|
|
||||||
encoded.append(CurveTypeEncoding.Ellipse.value)
|
|
||||||
encoded.append(self.firstRadius)
|
|
||||||
encoded.append(self.secondRadius)
|
|
||||||
encoded.extend(self.domain.to_list())
|
|
||||||
encoded.extend(self.plane.to_list())
|
|
||||||
encoded.append(get_encoding_from_units(self.units))
|
|
||||||
return encoded
|
|
||||||
|
|
||||||
|
|
||||||
class Polyline(Base, speckle_type=GEOMETRY + "Polyline", chunkable={"value": 20000}):
|
|
||||||
value: List[float] = None
|
|
||||||
closed: bool = None
|
|
||||||
domain: Interval = None
|
|
||||||
bbox: Box = None
|
|
||||||
area: float = None
|
|
||||||
length: float = None
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_points(cls, points: List[Point]):
|
|
||||||
polyline = cls()
|
|
||||||
polyline.units = points[0].units
|
|
||||||
polyline.value = []
|
|
||||||
for point in points:
|
|
||||||
polyline.value.extend([point.x, point.y, point.z])
|
|
||||||
return polyline
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_list(cls, args: List[Any]) -> "Polyline":
|
|
||||||
point_count = args[4]
|
|
||||||
return cls(
|
|
||||||
closed=bool(args[1]),
|
|
||||||
domain=Interval.from_list(args[2:4]),
|
|
||||||
value=args[5 : 5 + point_count],
|
|
||||||
units=get_units_from_encoding(args[-1]),
|
|
||||||
)
|
|
||||||
|
|
||||||
def to_list(self) -> List[Any]:
|
|
||||||
encoded = []
|
|
||||||
encoded.append(CurveTypeEncoding.Polyline.value)
|
|
||||||
encoded.append(int(self.closed))
|
|
||||||
encoded.extend(self.domain.to_list())
|
|
||||||
encoded.append(len(self.value))
|
|
||||||
encoded.extend(self.value)
|
|
||||||
encoded.append(get_encoding_from_units(self.units))
|
|
||||||
return encoded
|
|
||||||
|
|
||||||
def as_points(self) -> List[Point]:
|
|
||||||
"""Converts the `value` attribute to a list of Points"""
|
|
||||||
if not self.value:
|
|
||||||
return
|
|
||||||
|
|
||||||
if len(self.value) % 3:
|
|
||||||
raise ValueError("Points array malformed: length%3 != 0.")
|
|
||||||
|
|
||||||
values = iter(self.value)
|
|
||||||
return [
|
|
||||||
Point(x=v, y=next(values), z=next(values), units=self.units) for v in values
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
class Curve(
|
|
||||||
Base,
|
|
||||||
speckle_type=GEOMETRY + "Curve",
|
|
||||||
chunkable={"points": 20000, "weights": 20000, "knots": 20000},
|
|
||||||
):
|
|
||||||
degree: int = None
|
|
||||||
periodic: bool = None
|
|
||||||
rational: bool = None
|
|
||||||
points: List[float] = None
|
|
||||||
weights: List[float] = None
|
|
||||||
knots: List[float] = None
|
|
||||||
domain: Interval = None
|
|
||||||
displayValue: Polyline = None
|
|
||||||
closed: bool = None
|
|
||||||
bbox: Box = None
|
|
||||||
area: float = None
|
|
||||||
length: float = None
|
|
||||||
|
|
||||||
def as_points(self) -> List[Point]:
|
|
||||||
"""Converts the `value` attribute to a list of Points"""
|
|
||||||
if not self.points:
|
|
||||||
return
|
|
||||||
|
|
||||||
if len(self.points) % 3:
|
|
||||||
raise ValueError("Points array malformed: length%3 != 0.")
|
|
||||||
|
|
||||||
values = iter(self.points)
|
|
||||||
return [
|
|
||||||
Point(x=v, y=next(values), z=next(values), units=self.units) for v in values
|
|
||||||
]
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_list(cls, args: List[Any]) -> "Curve":
|
|
||||||
point_count = args[7]
|
|
||||||
weights_count = args[8]
|
|
||||||
knots_count = args[9]
|
|
||||||
|
|
||||||
points_start = 10
|
|
||||||
weights_start = 10 + point_count
|
|
||||||
knots_start = weights_start + weights_count
|
|
||||||
knots_end = knots_start + knots_count
|
|
||||||
|
|
||||||
return cls(
|
|
||||||
degree=args[1],
|
|
||||||
periodic=bool(args[2]),
|
|
||||||
rational=bool(args[3]),
|
|
||||||
closed=bool(args[4]),
|
|
||||||
domain=Interval.from_list(args[5:7]),
|
|
||||||
points=args[points_start:weights_start],
|
|
||||||
weights=args[weights_start:knots_start],
|
|
||||||
knots=args[knots_start:knots_end],
|
|
||||||
units=get_units_from_encoding(args[-1]),
|
|
||||||
)
|
|
||||||
|
|
||||||
def to_list(self) -> List[Any]:
|
|
||||||
encoded = []
|
|
||||||
encoded.append(CurveTypeEncoding.Curve.value)
|
|
||||||
encoded.append(self.degree)
|
|
||||||
encoded.append(int(self.periodic))
|
|
||||||
encoded.append(int(self.rational))
|
|
||||||
encoded.append(int(self.closed))
|
|
||||||
encoded.extend(self.domain.to_list())
|
|
||||||
encoded.append(len(self.points))
|
|
||||||
encoded.append(len(self.weights))
|
|
||||||
encoded.append(len(self.knots))
|
|
||||||
encoded.extend(self.points)
|
|
||||||
encoded.extend(self.weights)
|
|
||||||
encoded.extend(self.knots)
|
|
||||||
encoded.append(get_encoding_from_units(self.units))
|
|
||||||
return encoded
|
|
||||||
|
|
||||||
|
|
||||||
class Polycurve(Base, speckle_type=GEOMETRY + "Polycurve"):
|
|
||||||
segments: List[Base] = None
|
|
||||||
domain: Interval = None
|
|
||||||
closed: bool = None
|
|
||||||
bbox: Box = None
|
|
||||||
area: float = None
|
|
||||||
length: float = None
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_list(cls, args: List[Any]) -> "Polycurve":
|
|
||||||
curve_arrays = CurveArray()
|
|
||||||
curve_arrays.data = args[4:-1]
|
|
||||||
return cls(
|
|
||||||
closed=bool(args[1]),
|
|
||||||
domain=Interval.from_list(args[2:4]),
|
|
||||||
segments=curve_arrays.to_curves(),
|
|
||||||
units=get_units_from_encoding(args[-1]),
|
|
||||||
)
|
|
||||||
|
|
||||||
def to_list(self) -> List[Any]:
|
|
||||||
encoded = []
|
|
||||||
encoded.append(CurveTypeEncoding.Polycurve.value)
|
|
||||||
encoded.append(int(self.closed))
|
|
||||||
encoded.extend(self.domain.to_list())
|
|
||||||
curve_array = CurveArray.from_curves(self.segments)
|
|
||||||
encoded.extend(curve_array.data)
|
|
||||||
encoded.append(get_encoding_from_units(self.units))
|
|
||||||
return encoded
|
|
||||||
|
|
||||||
|
|
||||||
class Extrusion(Base, speckle_type=GEOMETRY + "Extrusion"):
|
|
||||||
capped: bool = None
|
|
||||||
profile: Base = None
|
|
||||||
pathStart: Point = None
|
|
||||||
pathEnd: Point = None
|
|
||||||
pathCurve: Base = None
|
|
||||||
pathTangent: Base = None
|
|
||||||
profiles: List[Base] = None
|
|
||||||
length: float = None
|
|
||||||
area: float = None
|
|
||||||
volume: float = None
|
|
||||||
bbox: Box = None
|
|
||||||
|
|
||||||
|
|
||||||
class Mesh(
|
|
||||||
Base,
|
|
||||||
speckle_type=GEOMETRY + "Mesh",
|
|
||||||
chunkable={
|
|
||||||
"vertices": 2000,
|
|
||||||
"faces": 2000,
|
|
||||||
"colors": 2000,
|
|
||||||
"textureCoordinates": 2000,
|
|
||||||
},
|
|
||||||
):
|
|
||||||
vertices: List[float] = None
|
|
||||||
faces: List[int] = None
|
|
||||||
colors: List[int] = None
|
|
||||||
textureCoordinates: List[float] = None
|
|
||||||
bbox: Box = None
|
|
||||||
area: float = None
|
|
||||||
volume: float = None
|
|
||||||
|
|
||||||
|
|
||||||
class Surface(Base, speckle_type=GEOMETRY + "Surface"):
|
|
||||||
degreeU: int = None
|
|
||||||
degreeV: int = None
|
|
||||||
rational: bool = None
|
|
||||||
area: float = None
|
|
||||||
pointData: List[float] = None
|
|
||||||
countU: int = None
|
|
||||||
countV: int = None
|
|
||||||
bbox: Box = None
|
|
||||||
closedU: bool = None
|
|
||||||
closedV: bool = None
|
|
||||||
domainU: Interval = None
|
|
||||||
domainV: Interval = None
|
|
||||||
knotsU: List[float] = None
|
|
||||||
knotsV: List[float] = None
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_list(cls, args: List[Any]) -> "Surface":
|
|
||||||
point_count = int(args[11])
|
|
||||||
knots_u_count = int(args[12])
|
|
||||||
knots_v_count = int(args[13])
|
|
||||||
|
|
||||||
start_point_data = 14
|
|
||||||
start_knots_u = start_point_data + point_count
|
|
||||||
start_knots_v = start_knots_u + knots_u_count
|
|
||||||
|
|
||||||
return cls(
|
|
||||||
degreeU=int(args[0]),
|
|
||||||
degreeV=int(args[1]),
|
|
||||||
countU=int(args[2]),
|
|
||||||
countV=int(args[3]),
|
|
||||||
rational=bool(args[4]),
|
|
||||||
closedU=bool(args[5]),
|
|
||||||
closedV=bool(args[6]),
|
|
||||||
domainU=Interval(start=args[7], end=args[8]),
|
|
||||||
domainV=Interval(start=args[9], end=args[10]),
|
|
||||||
pointData=args[start_point_data:start_knots_u],
|
|
||||||
knotsU=args[start_knots_u:start_knots_v],
|
|
||||||
knotsV=args[start_knots_v : start_knots_v + knots_v_count],
|
|
||||||
units=get_units_from_encoding(args[-1]),
|
|
||||||
)
|
|
||||||
|
|
||||||
def to_list(self) -> List[Any]:
|
|
||||||
encoded = []
|
|
||||||
encoded.append(self.degreeU)
|
|
||||||
encoded.append(self.degreeV)
|
|
||||||
encoded.append(self.countU)
|
|
||||||
encoded.append(self.countV)
|
|
||||||
encoded.append(int(self.rational))
|
|
||||||
encoded.append(int(self.closedU))
|
|
||||||
encoded.append(int(self.closedV))
|
|
||||||
encoded.extend(self.domainU.to_list())
|
|
||||||
encoded.extend(self.domainV.to_list())
|
|
||||||
encoded.append(len(self.pointData))
|
|
||||||
encoded.append(len(self.knotsU))
|
|
||||||
encoded.append(len(self.knotsV))
|
|
||||||
encoded.extend(self.pointData)
|
|
||||||
encoded.extend(self.knotsU)
|
|
||||||
encoded.extend(self.knotsV)
|
|
||||||
encoded.append(get_encoding_from_units(self.units))
|
|
||||||
return encoded
|
|
||||||
|
|
||||||
|
|
||||||
class BrepFace(Base, speckle_type=GEOMETRY + "BrepFace"):
|
|
||||||
_Brep: "Brep" = None
|
|
||||||
SurfaceIndex: int = None
|
|
||||||
LoopIndices: List[int] = None
|
|
||||||
OuterLoopIndex: int = None
|
|
||||||
OrientationReversed: bool = None
|
|
||||||
|
|
||||||
@property
|
|
||||||
def _outer_loop(self):
|
|
||||||
return self._Brep.Loops[self.OuterLoopIndex]
|
|
||||||
|
|
||||||
@property
|
|
||||||
def _surface(self):
|
|
||||||
return self._Brep.Surfaces[self.SurfaceIndex]
|
|
||||||
|
|
||||||
@property
|
|
||||||
def _loops(self):
|
|
||||||
if self.LoopIndices:
|
|
||||||
return [self._Brep.Loops[i] for i in self.LoopIndices]
|
|
||||||
|
|
||||||
|
|
||||||
class BrepEdge(Base, speckle_type=GEOMETRY + "BrepEdge"):
|
|
||||||
_Brep: "Brep" = None
|
|
||||||
Curve3dIndex: int = None
|
|
||||||
TrimIndices: List[int] = None
|
|
||||||
StartIndex: int = None
|
|
||||||
EndIndex: int = None
|
|
||||||
ProxyCurveIsReversed: bool = None
|
|
||||||
Domain: Interval = None
|
|
||||||
|
|
||||||
@property
|
|
||||||
def _start_vertex(self):
|
|
||||||
return self._Brep.Vertices[self.StartIndex]
|
|
||||||
|
|
||||||
@property
|
|
||||||
def _end_vertex(self):
|
|
||||||
return self._Brep.Vertices[self.EndIndex]
|
|
||||||
|
|
||||||
@property
|
|
||||||
def _trims(self):
|
|
||||||
if self.TrimIndices:
|
|
||||||
return [self._Brep.Trims[i] for i in self.TrimIndices]
|
|
||||||
|
|
||||||
@property
|
|
||||||
def _curve(self):
|
|
||||||
return self._Brep.Curve3D[self.Curve3dIndex]
|
|
||||||
|
|
||||||
|
|
||||||
class BrepLoop(Base, speckle_type=GEOMETRY + "BrepLoop"):
|
|
||||||
_Brep: "Brep" = None
|
|
||||||
FaceIndex: int = None
|
|
||||||
TrimIndices: List[int] = None
|
|
||||||
Type: str = None
|
|
||||||
|
|
||||||
@property
|
|
||||||
def _face(self):
|
|
||||||
return self._Brep.Faces[self.FaceIndex]
|
|
||||||
|
|
||||||
@property
|
|
||||||
def _trims(self):
|
|
||||||
if self.TrimIndices:
|
|
||||||
return [self._Brep.Trims[i] for i in self.TrimIndices]
|
|
||||||
|
|
||||||
|
|
||||||
class BrepTrimTypeEnum(int, Enum):
|
|
||||||
Unknown = 0
|
|
||||||
Boundary = 1
|
|
||||||
Mated = 2
|
|
||||||
Seam = 3
|
|
||||||
Singular = 4
|
|
||||||
CurveOnSurface = 5
|
|
||||||
PointOnSurface = 6
|
|
||||||
Slit = 7
|
|
||||||
|
|
||||||
|
|
||||||
class BrepTrim(Base, speckle_type=GEOMETRY + "BrepTrim"):
|
|
||||||
_Brep: "Brep" = None
|
|
||||||
EdgeIndex: int = None
|
|
||||||
StartIndex: int = None
|
|
||||||
EndIndex: int = None
|
|
||||||
FaceIndex: int = None
|
|
||||||
LoopIndex: int = None
|
|
||||||
CurveIndex: int = None
|
|
||||||
IsoStatus: int = None
|
|
||||||
TrimType: str = None
|
|
||||||
IsReversed: bool = None
|
|
||||||
Domain: Interval = None
|
|
||||||
|
|
||||||
@property
|
|
||||||
def _face(self):
|
|
||||||
return self._Brep.Faces[self.FaceIndex]
|
|
||||||
|
|
||||||
@property
|
|
||||||
def _loop(self):
|
|
||||||
return self._Brep.Loops[self.LoopIndex]
|
|
||||||
|
|
||||||
@property
|
|
||||||
def _edge(self):
|
|
||||||
return self._Brep.Edges[self.EdgeIndex] if self.EdgeIndex != -1 else None
|
|
||||||
|
|
||||||
@property
|
|
||||||
def _curve_2d(self):
|
|
||||||
return self._Brep.Curve2D[self.CurveIndex]
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_list(cls, args: List[Any]) -> "BrepTrim":
|
|
||||||
return cls(
|
|
||||||
EdgeIndex=args[0],
|
|
||||||
StartIndex=args[1],
|
|
||||||
EndIndex=args[2],
|
|
||||||
FaceIndex=args[3],
|
|
||||||
LoopIndex=args[4],
|
|
||||||
CurveIndex=args[5],
|
|
||||||
IsoStatus=args[6],
|
|
||||||
TrimType=BrepTrimTypeEnum(args[7]).name,
|
|
||||||
IsReversed=bool(args[8]),
|
|
||||||
)
|
|
||||||
|
|
||||||
def to_list(self) -> List[Any]:
|
|
||||||
encoded = []
|
|
||||||
encoded.append(self.EdgeIndex)
|
|
||||||
encoded.append(self.StartIndex)
|
|
||||||
encoded.append(self.EndIndex)
|
|
||||||
encoded.append(self.FaceIndex)
|
|
||||||
encoded.append(self.LoopIndex)
|
|
||||||
encoded.append(self.CurveIndex)
|
|
||||||
encoded.append(self.IsoStatus)
|
|
||||||
encoded.append(getattr(BrepTrimTypeEnum, self.TrimType).value)
|
|
||||||
encoded.append(self.IsReversed)
|
|
||||||
return encoded
|
|
||||||
|
|
||||||
|
|
||||||
class Brep(
|
|
||||||
Base,
|
|
||||||
speckle_type=GEOMETRY + "Brep",
|
|
||||||
chunkable={
|
|
||||||
"SurfacesValue": 200,
|
|
||||||
"Curve3DValues": 200,
|
|
||||||
"Curve2DValues": 200,
|
|
||||||
"VerticesValue": 5000,
|
|
||||||
"Edges": 5000,
|
|
||||||
"Loops": 5000,
|
|
||||||
"TrimsValue": 5000,
|
|
||||||
"Faces": 5000,
|
|
||||||
},
|
|
||||||
detachable={"displayValue"},
|
|
||||||
serialize_ignore={"Surfaces", "Curve3D", "Curve2D", "Vertices", "Trims"},
|
|
||||||
):
|
|
||||||
provenance: str = None
|
|
||||||
bbox: Box = None
|
|
||||||
area: float = None
|
|
||||||
volume: float = None
|
|
||||||
displayValue: Mesh = None
|
|
||||||
Surfaces: List[Surface] = None
|
|
||||||
Curve3D: List[Base] = None
|
|
||||||
Curve2D: List[Base] = None
|
|
||||||
Vertices: List[Point] = None
|
|
||||||
IsClosed: bool = None
|
|
||||||
Orientation: int = None
|
|
||||||
|
|
||||||
def _inject_self_into_children(self, children: Optional[List[Base]]) -> List[Base]:
|
|
||||||
if children is None:
|
|
||||||
return children
|
|
||||||
|
|
||||||
for child in children:
|
|
||||||
child._Brep = self
|
|
||||||
return children
|
|
||||||
|
|
||||||
@property
|
|
||||||
def Edges(self) -> List[BrepEdge]:
|
|
||||||
return self._inject_self_into_children(self._Edges)
|
|
||||||
|
|
||||||
@Edges.setter
|
|
||||||
def Edges(self, value: List[BrepEdge]):
|
|
||||||
self._Edges = value
|
|
||||||
|
|
||||||
@property
|
|
||||||
def Loops(self) -> List[BrepLoop]:
|
|
||||||
return self._inject_self_into_children(self._Loops)
|
|
||||||
|
|
||||||
@Loops.setter
|
|
||||||
def Loops(self, value: List[BrepLoop]):
|
|
||||||
self._Loops = value
|
|
||||||
|
|
||||||
@property
|
|
||||||
def Faces(self) -> List[BrepFace]:
|
|
||||||
return self._inject_self_into_children(self._Faces)
|
|
||||||
|
|
||||||
@Faces.setter
|
|
||||||
def Faces(self, value: List[BrepFace]):
|
|
||||||
self._Faces = value
|
|
||||||
|
|
||||||
@property
|
|
||||||
def SurfacesValue(self) -> List[float]:
|
|
||||||
if self.Surfaces is None:
|
|
||||||
return None
|
|
||||||
return ObjectArray.from_objects(self.Surfaces).data
|
|
||||||
|
|
||||||
@SurfacesValue.setter
|
|
||||||
def SurfacesValue(self, value: List[float]):
|
|
||||||
self.Surfaces = ObjectArray.decode_data(value, Surface.from_list)
|
|
||||||
|
|
||||||
@property
|
|
||||||
def Curve3DValues(self) -> List[float]:
|
|
||||||
if self.Curve3D is None:
|
|
||||||
return None
|
|
||||||
return CurveArray.from_curves(self.Curve3D).data
|
|
||||||
|
|
||||||
@Curve3DValues.setter
|
|
||||||
def Curve3DValues(self, value: List[float]):
|
|
||||||
crv_array = CurveArray()
|
|
||||||
crv_array.data = value
|
|
||||||
self.Curve3D = crv_array.to_curves()
|
|
||||||
|
|
||||||
@property
|
|
||||||
def Curve2DValues(self) -> List[Base]:
|
|
||||||
if self.Curve2D is None:
|
|
||||||
return None
|
|
||||||
return CurveArray.from_curves(self.Curve2D).data
|
|
||||||
|
|
||||||
@Curve2DValues.setter
|
|
||||||
def Curve2DValues(self, value: List[float]):
|
|
||||||
crv_array = CurveArray()
|
|
||||||
crv_array.data = value
|
|
||||||
self.Curve2D = crv_array.to_curves()
|
|
||||||
|
|
||||||
@property
|
|
||||||
def VerticesValue(self) -> List[Point]:
|
|
||||||
if self.Vertices is None:
|
|
||||||
return None
|
|
||||||
encoded_unit = get_encoding_from_units(self.Vertices[0].units)
|
|
||||||
values = [encoded_unit]
|
|
||||||
for vertex in self.Vertices:
|
|
||||||
values.extend(vertex.to_list())
|
|
||||||
return values
|
|
||||||
|
|
||||||
@VerticesValue.setter
|
|
||||||
def VerticesValue(self, value: List[float]):
|
|
||||||
value = value.copy()
|
|
||||||
units = get_units_from_encoding(value.pop(0))
|
|
||||||
|
|
||||||
vertices = []
|
|
||||||
|
|
||||||
for i in range(0, len(value), 3):
|
|
||||||
vertex = Point.from_list(value[i : i + 3])
|
|
||||||
vertex._units = units
|
|
||||||
vertices.append(vertex)
|
|
||||||
|
|
||||||
self.Vertices = vertices
|
|
||||||
|
|
||||||
@property
|
|
||||||
def Trims(self) -> List[BrepTrim]:
|
|
||||||
return self._inject_self_into_children(self._Trims)
|
|
||||||
|
|
||||||
@Trims.setter
|
|
||||||
def Trims(self, value: List[BrepTrim]):
|
|
||||||
self._Trims = value
|
|
||||||
|
|
||||||
@property
|
|
||||||
def TrimsValue(self) -> List[float]:
|
|
||||||
if self.Trims is None:
|
|
||||||
return None
|
|
||||||
values = []
|
|
||||||
for trim in self.Trims:
|
|
||||||
values.extend(trim.to_list())
|
|
||||||
return values
|
|
||||||
|
|
||||||
@TrimsValue.setter
|
|
||||||
def TrimsValue(self, value: List[float]):
|
|
||||||
self.Trims = [
|
|
||||||
BrepTrim.from_list(value[i : i + 9]) for i in range(0, len(value), 9)
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
BrepEdge.update_forward_refs()
|
|
||||||
BrepLoop.update_forward_refs()
|
|
||||||
BrepTrim.update_forward_refs()
|
|
||||||
BrepFace.update_forward_refs()
|
|
||||||
@@ -1,199 +0,0 @@
|
|||||||
from typing import List
|
|
||||||
from specklepy.objects.geometry import Point, Vector
|
|
||||||
from .base import Base
|
|
||||||
|
|
||||||
OTHER = "Objects.Other."
|
|
||||||
|
|
||||||
IDENTITY_TRANSFORM = [
|
|
||||||
1.0,
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
1.0,
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
1.0,
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
1.0,
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
class RenderMaterial(Base, speckle_type=OTHER + "RenderMaterial"):
|
|
||||||
name: str = None
|
|
||||||
opacity: float = 1
|
|
||||||
metalness: float = 0
|
|
||||||
roughness: float = 1
|
|
||||||
diffuse: int = -2894893 # light gray arbg
|
|
||||||
emissive: int = -16777216 # black arbg
|
|
||||||
|
|
||||||
|
|
||||||
class Transform(
|
|
||||||
Base,
|
|
||||||
speckle_type=OTHER + "Transform",
|
|
||||||
serialize_ignore={"translation", "scaling", "is_identity"},
|
|
||||||
):
|
|
||||||
"""The 4x4 transformation matrix
|
|
||||||
|
|
||||||
The 3x3 sub-matrix determines scaling.
|
|
||||||
The 4th column defines translation, where the last value is a divisor (usually equal to 1).
|
|
||||||
"""
|
|
||||||
|
|
||||||
_value: List[float] = None
|
|
||||||
|
|
||||||
@property
|
|
||||||
def value(self) -> List[float]:
|
|
||||||
"""The transform matrix represented as a flat list of 16 floats"""
|
|
||||||
return self._value
|
|
||||||
|
|
||||||
@value.setter
|
|
||||||
def value(self, value: List[float]) -> None:
|
|
||||||
try:
|
|
||||||
value = [float(x) for x in value]
|
|
||||||
except (ValueError, TypeError):
|
|
||||||
raise ValueError(
|
|
||||||
f"Could not create a Transform object with the requested value. Input must be a 16 element list of numbers. Value provided: {value}"
|
|
||||||
)
|
|
||||||
if len(value) != 16:
|
|
||||||
raise ValueError(
|
|
||||||
f"Could not create a Transform object: input list should be 16 floats long, but was {len(value)} long"
|
|
||||||
)
|
|
||||||
|
|
||||||
self._value = value
|
|
||||||
|
|
||||||
@property
|
|
||||||
def translation(self) -> List[float]:
|
|
||||||
"""The final column of the matrix which defines the translation"""
|
|
||||||
return [self._value[i] for i in (3, 7, 11, 15)]
|
|
||||||
|
|
||||||
@property
|
|
||||||
def scaling(self) -> List[float]:
|
|
||||||
"""The 3x3 scaling sub-matrix"""
|
|
||||||
return [self._value[i] for i in (0, 1, 2, 4, 5, 6, 8, 9, 10)]
|
|
||||||
|
|
||||||
@property
|
|
||||||
def is_identity(self) -> bool:
|
|
||||||
return self.value == IDENTITY_TRANSFORM
|
|
||||||
|
|
||||||
def apply_to_point(self, point: Point) -> Point:
|
|
||||||
"""Transform a single speckle Point
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
point {Point} -- the speckle Point to transform
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Point -- a new transformed point
|
|
||||||
"""
|
|
||||||
coords = self.apply_to_point_value([point.x, point.y, point.z])
|
|
||||||
return Point(x=coords[0], y=coords[1], z=coords[2], units=point.units)
|
|
||||||
|
|
||||||
def apply_to_point_value(self, point_value: List[float]) -> List[float]:
|
|
||||||
"""Transform a list of three floats representing a point
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
point_value {List[float]} -- a list of 3 floats
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
List[float] -- the list with the transform applied
|
|
||||||
"""
|
|
||||||
transformed = [
|
|
||||||
point_value[0] * self._value[i]
|
|
||||||
+ point_value[1] * self._value[i + 1]
|
|
||||||
+ point_value[2] * self._value[i + 2]
|
|
||||||
+ self._value[i + 3]
|
|
||||||
for i in range(0, 15, 4)
|
|
||||||
]
|
|
||||||
|
|
||||||
return [transformed[i] / transformed[3] for i in range(3)]
|
|
||||||
|
|
||||||
def apply_to_points(self, points: List[Point]) -> List[Point]:
|
|
||||||
"""Transform a list of speckle Points
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
points {List[Point]} -- the list of speckle Points to transform
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
List[Point] -- a new list of transformed points
|
|
||||||
"""
|
|
||||||
return [self.apply_to_point(point) for point in points]
|
|
||||||
|
|
||||||
def apply_to_points_values(self, points_value: List[float]) -> List[float]:
|
|
||||||
"""Transform a list of speckle Points
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
points {List[float]} -- a flat list of floats representing points to transform
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
List[float] -- a new transformed list
|
|
||||||
"""
|
|
||||||
if len(points_value) % 3 != 0:
|
|
||||||
raise ValueError(
|
|
||||||
"Cannot apply transform as the points list is malformed: expected length to be multiple of 3"
|
|
||||||
)
|
|
||||||
transformed = []
|
|
||||||
for i in range(0, len(points_value), 3):
|
|
||||||
transformed.extend(self.apply_to_point_value(points_value[i : i + 3]))
|
|
||||||
|
|
||||||
return transformed
|
|
||||||
|
|
||||||
def apply_to_vector(self, vector: Vector) -> Vector:
|
|
||||||
"""Transform a single speckle Vector
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
point {Vector} -- the speckle Vector to transform
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Vector -- a new transformed point
|
|
||||||
"""
|
|
||||||
coords = self.apply_to_vector_value([vector.x, vector.y, vector.z])
|
|
||||||
return Vector(x=coords[0], y=coords[1], z=coords[2], units=vector.units)
|
|
||||||
|
|
||||||
def apply_to_vector_value(self, vector_value: List[float]) -> List[float]:
|
|
||||||
"""Transform a list of three floats representing a vector
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
vector_value {List[float]} -- a list of 3 floats
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
List[float] -- the list with the transform applied
|
|
||||||
"""
|
|
||||||
return [
|
|
||||||
vector_value[0] * self._value[i]
|
|
||||||
+ vector_value[1] * self._value[i + 1]
|
|
||||||
+ vector_value[2] * self._value[i + 2]
|
|
||||||
for i in range(0, 15, 4)
|
|
||||||
][:3]
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def from_list(cls, value: List[float] = None) -> "Transform":
|
|
||||||
"""Returns a Transform object from a list of 16 numbers. If no value is provided, an identity transform will be returned.
|
|
||||||
|
|
||||||
Arguments:
|
|
||||||
value {List[float]} -- the matrix as a flat list of 16 numbers (defaults to the identity transform)
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Transform -- a complete transform object
|
|
||||||
"""
|
|
||||||
if not value:
|
|
||||||
value = IDENTITY_TRANSFORM
|
|
||||||
return cls(value=value)
|
|
||||||
|
|
||||||
|
|
||||||
class BlockDefinition(
|
|
||||||
Base, speckle_type=OTHER + "BlockDefinition", detachable={"geometry"}
|
|
||||||
):
|
|
||||||
name: str = None
|
|
||||||
basePoint: Point = None
|
|
||||||
geometry: List[Base] = None
|
|
||||||
|
|
||||||
|
|
||||||
class BlockInstance(
|
|
||||||
Base, speckle_type=OTHER + "BlockInstance", detachable={"blockDefinition"}
|
|
||||||
):
|
|
||||||
blockDefinition: BlockDefinition = None
|
|
||||||
transform: Transform = None
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
from specklepy.logging.exceptions import SpeckleException
|
|
||||||
|
|
||||||
UNITS = ["mm", "cm", "m", "in", "ft", "yd", "mi"]
|
|
||||||
|
|
||||||
UNITS_STRINGS = {
|
|
||||||
"mm": ["mm", "mil", "millimeters", "millimetres"],
|
|
||||||
"cm": ["cm", "centimetre", "centimeter", "centimetres", "centimeters"],
|
|
||||||
"m": ["m", "meter", "meters", "metre", "metres"],
|
|
||||||
"km": ["km", "kilometer", "kilometre", "kilometers", "kilometres"],
|
|
||||||
"in": ["in", "inch", "inches"],
|
|
||||||
"ft": ["ft", "foot", "feet"],
|
|
||||||
"yd": ["yd", "yard", "yards"],
|
|
||||||
"mi": ["mi", "mile", "miles"],
|
|
||||||
"none": ["none", "null"],
|
|
||||||
}
|
|
||||||
|
|
||||||
UNITS_ENCODINGS = {
|
|
||||||
"none": 0,
|
|
||||||
"mm": 1,
|
|
||||||
"cm": 2,
|
|
||||||
"m": 3,
|
|
||||||
"km": 4,
|
|
||||||
"in": 5,
|
|
||||||
"ft": 6,
|
|
||||||
"yd": 7,
|
|
||||||
"mi": 8,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def get_units_from_string(unit: str):
|
|
||||||
unit = str.lower(unit)
|
|
||||||
for name, alternates in UNITS_STRINGS.items():
|
|
||||||
if unit in alternates:
|
|
||||||
return name
|
|
||||||
|
|
||||||
raise SpeckleException(
|
|
||||||
message=f"Could not understand what unit {unit} is referring to. Please enter a valid unit (eg {UNITS})."
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def get_units_from_encoding(unit: int):
|
|
||||||
for name, encoding in UNITS_ENCODINGS.items():
|
|
||||||
if unit == encoding:
|
|
||||||
return name
|
|
||||||
|
|
||||||
raise SpeckleException(
|
|
||||||
message=f"Could not understand what unit {unit} is referring to. Please enter a valid unit encoding (eg {UNITS_ENCODINGS})."
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def get_encoding_from_units(unit: str):
|
|
||||||
try:
|
|
||||||
return UNITS_ENCODINGS[unit]
|
|
||||||
except KeyError:
|
|
||||||
raise SpeckleException(
|
|
||||||
message=f"No encoding exists for unit {unit}. Please enter a valid unit to encode (eg {UNITS_ENCODINGS})."
|
|
||||||
)
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
from .server import ServerTransport
|
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
"""This module contains an SDK for working with Speckle Automate."""
|
||||||
|
|
||||||
|
from speckle_automate.automation_context import AutomationContext
|
||||||
|
from speckle_automate.runner import execute_automate_function, run_function
|
||||||
|
from speckle_automate.schema import (
|
||||||
|
AutomateBase,
|
||||||
|
AutomationResult,
|
||||||
|
AutomationRunData,
|
||||||
|
AutomationStatus,
|
||||||
|
ObjectResultLevel,
|
||||||
|
ResultCase,
|
||||||
|
)
|
||||||
|
|
||||||
|
__all__ = [
|
||||||
|
"AutomationContext",
|
||||||
|
"AutomateBase",
|
||||||
|
"AutomationStatus",
|
||||||
|
"AutomationResult",
|
||||||
|
"AutomationRunData",
|
||||||
|
"ResultCase",
|
||||||
|
"ObjectResultLevel",
|
||||||
|
"run_function",
|
||||||
|
"execute_automate_function",
|
||||||
|
]
|
||||||
@@ -0,0 +1,495 @@
|
|||||||
|
"""This module provides an abstraction layer above the Speckle Automate runtime."""
|
||||||
|
|
||||||
|
import time
|
||||||
|
from dataclasses import dataclass, field
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import Any, Dict, List, Optional, Union
|
||||||
|
|
||||||
|
import httpx
|
||||||
|
from gql import gql
|
||||||
|
|
||||||
|
from speckle_automate.schema import (
|
||||||
|
AutomateBase,
|
||||||
|
AutomationResult,
|
||||||
|
AutomationRunData,
|
||||||
|
AutomationStatus,
|
||||||
|
ObjectResultLevel,
|
||||||
|
ResultCase,
|
||||||
|
)
|
||||||
|
from specklepy.api import operations
|
||||||
|
from specklepy.api.client import SpeckleClient
|
||||||
|
from specklepy.core.api.inputs.model_inputs import CreateModelInput
|
||||||
|
from specklepy.core.api.inputs.version_inputs import CreateVersionInput
|
||||||
|
from specklepy.core.api.models.current import Model, Version
|
||||||
|
from specklepy.logging.exceptions import SpeckleException
|
||||||
|
from specklepy.objects.base import Base
|
||||||
|
from specklepy.transports.memory import MemoryTransport
|
||||||
|
from specklepy.transports.server import ServerTransport
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class AutomationContext:
|
||||||
|
"""A context helper class.
|
||||||
|
|
||||||
|
This class exposes methods to work with the Speckle Automate context inside
|
||||||
|
Speckle Automate functions.
|
||||||
|
|
||||||
|
An instance of AutomationContext is injected into every run of a function.
|
||||||
|
"""
|
||||||
|
|
||||||
|
automation_run_data: AutomationRunData
|
||||||
|
speckle_client: SpeckleClient
|
||||||
|
_server_transport: ServerTransport
|
||||||
|
_speckle_token: str
|
||||||
|
|
||||||
|
#: keep a memory transponrt at hand, to speed up things if needed
|
||||||
|
_memory_transport: MemoryTransport = field(default_factory=MemoryTransport)
|
||||||
|
|
||||||
|
#: added for performance measuring
|
||||||
|
_init_time: float = field(default_factory=time.perf_counter)
|
||||||
|
_automation_result: AutomationResult = field(default_factory=AutomationResult)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def initialize(
|
||||||
|
cls, automation_run_data: Union[str, AutomationRunData], speckle_token: str
|
||||||
|
) -> "AutomationContext":
|
||||||
|
"""Bootstrap the AutomateSDK from raw data.
|
||||||
|
|
||||||
|
Todo:
|
||||||
|
----
|
||||||
|
* bootstrap a structlog logger instance
|
||||||
|
* expose a logger, that ppl can use instead of print
|
||||||
|
"""
|
||||||
|
# parse the json value if its not an initialized project data instance
|
||||||
|
automation_run_data = (
|
||||||
|
automation_run_data
|
||||||
|
if isinstance(automation_run_data, AutomationRunData)
|
||||||
|
else AutomationRunData.model_validate_json(automation_run_data)
|
||||||
|
)
|
||||||
|
speckle_client = SpeckleClient(
|
||||||
|
automation_run_data.speckle_server_url,
|
||||||
|
automation_run_data.speckle_server_url.startswith("https"),
|
||||||
|
)
|
||||||
|
speckle_client.authenticate_with_token(speckle_token)
|
||||||
|
if not speckle_client.account:
|
||||||
|
msg = (
|
||||||
|
f"Could not authenticate to {automation_run_data.speckle_server_url}",
|
||||||
|
"with the provided token",
|
||||||
|
)
|
||||||
|
raise ValueError(msg)
|
||||||
|
server_transport = ServerTransport(
|
||||||
|
automation_run_data.project_id, speckle_client
|
||||||
|
)
|
||||||
|
return cls(automation_run_data, speckle_client, server_transport, speckle_token)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def run_status(self) -> AutomationStatus:
|
||||||
|
"""Get the status of the automation run."""
|
||||||
|
return self._automation_result.run_status
|
||||||
|
|
||||||
|
@property
|
||||||
|
def status_message(self) -> Optional[str]:
|
||||||
|
"""Get the current status message."""
|
||||||
|
return self._automation_result.status_message
|
||||||
|
|
||||||
|
def elapsed(self) -> float:
|
||||||
|
"""Return the elapsed time in seconds since the initialization time."""
|
||||||
|
return time.perf_counter() - self._init_time
|
||||||
|
|
||||||
|
def receive_version(self) -> Base:
|
||||||
|
"""Receive the Speckle project version that triggered this automation run."""
|
||||||
|
# TODO: this is a quick hack to keep implementation consistency.
|
||||||
|
# Move to proper receive many versions
|
||||||
|
version_id = self.automation_run_data.triggers[0].payload.version_id
|
||||||
|
try:
|
||||||
|
version = self.speckle_client.version.get(
|
||||||
|
version_id, self.automation_run_data.project_id
|
||||||
|
)
|
||||||
|
except SpeckleException as err:
|
||||||
|
raise ValueError(
|
||||||
|
f"""Could not receive specified version.
|
||||||
|
Is your environment configured correctly?
|
||||||
|
project_id: {self.automation_run_data.project_id}
|
||||||
|
model_id: {self.automation_run_data.triggers[0].payload.model_id}
|
||||||
|
version_id: {self.automation_run_data.triggers[0].payload.version_id}
|
||||||
|
"""
|
||||||
|
) from err
|
||||||
|
|
||||||
|
if not version.referenced_object:
|
||||||
|
raise Exception(
|
||||||
|
"This version is past the version history limit,",
|
||||||
|
" cannot execute an automation on it",
|
||||||
|
)
|
||||||
|
|
||||||
|
base = operations.receive(
|
||||||
|
version.referenced_object, self._server_transport, self._memory_transport
|
||||||
|
)
|
||||||
|
# self._closure_tree = base["__closure"]
|
||||||
|
print(
|
||||||
|
f"It took {self.elapsed():.2f} seconds to receive",
|
||||||
|
f" the speckle version {version_id}",
|
||||||
|
)
|
||||||
|
return base
|
||||||
|
|
||||||
|
def create_new_model_in_project(
|
||||||
|
self, model_name: str, model_description: Optional[str] = None
|
||||||
|
) -> Model:
|
||||||
|
input = CreateModelInput(
|
||||||
|
name=model_name,
|
||||||
|
description=model_description,
|
||||||
|
project_id=self.automation_run_data.project_id,
|
||||||
|
)
|
||||||
|
|
||||||
|
return self.speckle_client.model.create(input)
|
||||||
|
|
||||||
|
def get_model(self, model_id: str) -> Model:
|
||||||
|
"""
|
||||||
|
Args:
|
||||||
|
model_id (str): The id of the model to get
|
||||||
|
"""
|
||||||
|
return self.speckle_client.model.get(
|
||||||
|
model_id, self.automation_run_data.project_id
|
||||||
|
)
|
||||||
|
|
||||||
|
def create_new_version_in_project(
|
||||||
|
self, root_object: Base, model_id: str, version_message: str = ""
|
||||||
|
) -> Version:
|
||||||
|
"""Save a base model to a new version on the project.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
root_object (Base): The Speckle base object for the new version.
|
||||||
|
model_id (str): Id of model to create the new version on.
|
||||||
|
version_message (str): The message for the new version.
|
||||||
|
"""
|
||||||
|
|
||||||
|
matching_trigger = [
|
||||||
|
t
|
||||||
|
for t in self.automation_run_data.triggers
|
||||||
|
if t.payload.model_id == model_id
|
||||||
|
]
|
||||||
|
if matching_trigger:
|
||||||
|
raise ValueError(
|
||||||
|
f"The target model: {model_id} cannot match the model"
|
||||||
|
f" that triggered this automation:"
|
||||||
|
f" {matching_trigger[0].payload.model_id}"
|
||||||
|
)
|
||||||
|
|
||||||
|
root_object_id = operations.send(
|
||||||
|
root_object,
|
||||||
|
[self._server_transport, self._memory_transport],
|
||||||
|
use_default_cache=False,
|
||||||
|
)
|
||||||
|
|
||||||
|
create_version_input = CreateVersionInput(
|
||||||
|
object_id=root_object_id,
|
||||||
|
model_id=model_id,
|
||||||
|
project_id=self.automation_run_data.project_id,
|
||||||
|
message=version_message,
|
||||||
|
source_application="SpeckleAutomate",
|
||||||
|
)
|
||||||
|
version = self.speckle_client.version.create(create_version_input)
|
||||||
|
|
||||||
|
self._automation_result.result_versions.append(version.id)
|
||||||
|
return version
|
||||||
|
|
||||||
|
@property
|
||||||
|
def context_view(self) -> Optional[str]:
|
||||||
|
return self._automation_result.result_view
|
||||||
|
|
||||||
|
def set_context_view(
|
||||||
|
self,
|
||||||
|
# f"{model_id}@{version_id} or {model_id} "
|
||||||
|
resource_ids: Optional[List[str]] = None,
|
||||||
|
include_source_model_version: bool = True,
|
||||||
|
) -> None:
|
||||||
|
link_resources = (
|
||||||
|
[
|
||||||
|
f"{t.payload.model_id}@{t.payload.version_id}"
|
||||||
|
for t in self.automation_run_data.triggers
|
||||||
|
]
|
||||||
|
if include_source_model_version
|
||||||
|
else []
|
||||||
|
)
|
||||||
|
if resource_ids:
|
||||||
|
link_resources.extend(resource_ids)
|
||||||
|
if not link_resources:
|
||||||
|
raise Exception(
|
||||||
|
"We do not have enough resource ids to compose a context view"
|
||||||
|
)
|
||||||
|
self._automation_result.result_view = (
|
||||||
|
f"/projects/{self.automation_run_data.project_id}"
|
||||||
|
f"/models/{','.join(link_resources)}"
|
||||||
|
)
|
||||||
|
|
||||||
|
def report_run_status(self) -> None:
|
||||||
|
"""Report the current run status to the project of this automation."""
|
||||||
|
query = gql(
|
||||||
|
"""
|
||||||
|
mutation AutomateFunctionRunStatusReport(
|
||||||
|
$projectId: String!
|
||||||
|
$functionRunId: String!
|
||||||
|
$status: AutomateRunStatus!
|
||||||
|
$statusMessage: String
|
||||||
|
$results: JSONObject
|
||||||
|
$contextView: String
|
||||||
|
){
|
||||||
|
automateFunctionRunStatusReport(input: {
|
||||||
|
projectId: $projectId
|
||||||
|
functionRunId: $functionRunId
|
||||||
|
status: $status
|
||||||
|
statusMessage: $statusMessage
|
||||||
|
contextView: $contextView
|
||||||
|
results: $results
|
||||||
|
})
|
||||||
|
}
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
if self.run_status in [AutomationStatus.SUCCEEDED, AutomationStatus.FAILED]:
|
||||||
|
object_results = {
|
||||||
|
"version": 2,
|
||||||
|
"values": {
|
||||||
|
"objectResults": self._automation_result.model_dump(by_alias=True)[
|
||||||
|
"objectResults"
|
||||||
|
],
|
||||||
|
"blobIds": self._automation_result.blobs,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
else:
|
||||||
|
object_results = None
|
||||||
|
|
||||||
|
params = {
|
||||||
|
"projectId": self.automation_run_data.project_id,
|
||||||
|
"functionRunId": self.automation_run_data.function_run_id,
|
||||||
|
"status": self.run_status.value,
|
||||||
|
"statusMessage": self._automation_result.status_message,
|
||||||
|
"results": object_results,
|
||||||
|
"contextView": self._automation_result.result_view,
|
||||||
|
}
|
||||||
|
print(f"Reporting run status with content: {params}")
|
||||||
|
self.speckle_client.httpclient.execute(query, params)
|
||||||
|
|
||||||
|
def store_file_result(self, file_path: Union[Path, str]) -> str:
|
||||||
|
"""Save a file attached to the project of this automation."""
|
||||||
|
path_obj = (
|
||||||
|
Path(file_path).resolve() if isinstance(file_path, str) else file_path
|
||||||
|
)
|
||||||
|
|
||||||
|
class UploadResult(AutomateBase):
|
||||||
|
blob_id: str
|
||||||
|
file_name: str
|
||||||
|
upload_status: int
|
||||||
|
|
||||||
|
class BlobUploadResponse(AutomateBase):
|
||||||
|
upload_results: list[UploadResult]
|
||||||
|
|
||||||
|
if not path_obj.exists():
|
||||||
|
raise ValueError("The given file path doesn't exist")
|
||||||
|
|
||||||
|
files = {path_obj.name: path_obj.open("rb")}
|
||||||
|
|
||||||
|
url = (
|
||||||
|
f"{self.automation_run_data.speckle_server_url}api/stream/"
|
||||||
|
f"{self.automation_run_data.project_id}/blob"
|
||||||
|
)
|
||||||
|
data = (
|
||||||
|
httpx.post(
|
||||||
|
url,
|
||||||
|
files=files,
|
||||||
|
headers={"authorization": f"Bearer {self._speckle_token}"},
|
||||||
|
)
|
||||||
|
.raise_for_status()
|
||||||
|
.json()
|
||||||
|
)
|
||||||
|
|
||||||
|
upload_response = BlobUploadResponse.model_validate(data)
|
||||||
|
|
||||||
|
if len(upload_response.upload_results) != 1:
|
||||||
|
raise ValueError("Expecting one upload result.")
|
||||||
|
|
||||||
|
self._automation_result.blobs.extend(
|
||||||
|
[upload_result.blob_id for upload_result in upload_response.upload_results]
|
||||||
|
)
|
||||||
|
|
||||||
|
return upload_response.upload_results[0].blob_id
|
||||||
|
|
||||||
|
def mark_run_failed(self, status_message: str) -> None:
|
||||||
|
"""Mark the current run a failure."""
|
||||||
|
self._mark_run(AutomationStatus.FAILED, status_message)
|
||||||
|
|
||||||
|
def mark_run_exception(self, status_message: str) -> None:
|
||||||
|
"""Mark the current run a failure."""
|
||||||
|
self._mark_run(AutomationStatus.EXCEPTION, status_message)
|
||||||
|
|
||||||
|
def mark_run_success(self, status_message: Optional[str]) -> None:
|
||||||
|
"""Mark the current run a success with an optional message."""
|
||||||
|
self._mark_run(AutomationStatus.SUCCEEDED, status_message)
|
||||||
|
|
||||||
|
def _mark_run(
|
||||||
|
self, status: AutomationStatus, status_message: Optional[str]
|
||||||
|
) -> None:
|
||||||
|
duration = self.elapsed()
|
||||||
|
self._automation_result.status_message = status_message
|
||||||
|
self._automation_result.run_status = status
|
||||||
|
self._automation_result.elapsed = duration
|
||||||
|
|
||||||
|
msg = f"Automation run {status.value} after {duration:.2f} seconds."
|
||||||
|
print("\n".join([msg, status_message]) if status_message else msg)
|
||||||
|
|
||||||
|
def attach_error_to_objects(
|
||||||
|
self,
|
||||||
|
category: str,
|
||||||
|
affected_objects: Union[Base, List[Base]],
|
||||||
|
message: Optional[str] = None,
|
||||||
|
metadata: Optional[Dict[str, Any]] = None,
|
||||||
|
visual_overrides: Optional[Dict[str, Any]] = None,
|
||||||
|
) -> None:
|
||||||
|
"""Add a new error case to the run results.
|
||||||
|
Args:
|
||||||
|
category (str): A short tag for the event type.
|
||||||
|
affected_objects (Union[Base, List[Base]]): A single object or a list of
|
||||||
|
objects that are causing the error case.
|
||||||
|
message (Optional[str]): Optional message.
|
||||||
|
metadata: User provided metadata key value pairs
|
||||||
|
visual_overrides: Case specific 3D visual overrides.
|
||||||
|
"""
|
||||||
|
self.attach_result_to_objects(
|
||||||
|
ObjectResultLevel.ERROR,
|
||||||
|
category,
|
||||||
|
affected_objects,
|
||||||
|
message,
|
||||||
|
metadata,
|
||||||
|
visual_overrides,
|
||||||
|
)
|
||||||
|
|
||||||
|
def attach_warning_to_objects(
|
||||||
|
self,
|
||||||
|
category: str,
|
||||||
|
affected_objects: Union[Base, List[Base]],
|
||||||
|
message: Optional[str] = None,
|
||||||
|
metadata: Optional[Dict[str, Any]] = None,
|
||||||
|
visual_overrides: Optional[Dict[str, Any]] = None,
|
||||||
|
) -> None:
|
||||||
|
"""Add a new warning case to the run results.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
category (str): A short tag for the event type.
|
||||||
|
affected_objects (Union[Base, List[Base]]): A single object or a list of
|
||||||
|
objects that are causing the warning case.
|
||||||
|
message (Optional[str]): Optional message.
|
||||||
|
metadata: User provided metadata key value pairs
|
||||||
|
visual_overrides: Case specific 3D visual overrides.
|
||||||
|
"""
|
||||||
|
self.attach_result_to_objects(
|
||||||
|
ObjectResultLevel.WARNING,
|
||||||
|
category,
|
||||||
|
affected_objects,
|
||||||
|
message,
|
||||||
|
metadata,
|
||||||
|
visual_overrides,
|
||||||
|
)
|
||||||
|
|
||||||
|
def attach_success_to_objects(
|
||||||
|
self,
|
||||||
|
category: str,
|
||||||
|
affected_objects: Union[Base, List[Base]],
|
||||||
|
message: Optional[str] = None,
|
||||||
|
metadata: Optional[Dict[str, Any]] = None,
|
||||||
|
visual_overrides: Optional[Dict[str, Any]] = None,
|
||||||
|
) -> None:
|
||||||
|
"""Add a new success case to the run results.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
category (str): A short tag for the event type.
|
||||||
|
affected_objects (Union[Base, List[Base]]): A single object or a list of
|
||||||
|
objects that are causing the success case.
|
||||||
|
message (Optional[str]): Optional message.
|
||||||
|
metadata: User provided metadata key value pairs
|
||||||
|
visual_overrides: Case specific 3D visual overrides.
|
||||||
|
"""
|
||||||
|
self.attach_result_to_objects(
|
||||||
|
ObjectResultLevel.SUCCESS,
|
||||||
|
category,
|
||||||
|
affected_objects,
|
||||||
|
message,
|
||||||
|
metadata,
|
||||||
|
visual_overrides,
|
||||||
|
)
|
||||||
|
|
||||||
|
def attach_info_to_objects(
|
||||||
|
self,
|
||||||
|
category: str,
|
||||||
|
affected_objects: Union[Base, List[Base]],
|
||||||
|
message: Optional[str] = None,
|
||||||
|
metadata: Optional[Dict[str, Any]] = None,
|
||||||
|
visual_overrides: Optional[Dict[str, Any]] = None,
|
||||||
|
) -> None:
|
||||||
|
"""Add a new info case to the run results.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
category (str): A short tag for the event type.
|
||||||
|
affected_objects (Union[Base, List[Base]]): A single object or a list of
|
||||||
|
objects that are causing the info case.
|
||||||
|
message (Optional[str]): Optional message.
|
||||||
|
metadata: User provided metadata key value pairs
|
||||||
|
visual_overrides: Case specific 3D visual overrides.
|
||||||
|
"""
|
||||||
|
self.attach_result_to_objects(
|
||||||
|
ObjectResultLevel.INFO,
|
||||||
|
category,
|
||||||
|
affected_objects,
|
||||||
|
message,
|
||||||
|
metadata,
|
||||||
|
visual_overrides,
|
||||||
|
)
|
||||||
|
|
||||||
|
def attach_result_to_objects(
|
||||||
|
self,
|
||||||
|
level: ObjectResultLevel,
|
||||||
|
category: str,
|
||||||
|
affected_objects: Union[Base, List[Base]],
|
||||||
|
message: Optional[str] = None,
|
||||||
|
metadata: Optional[Dict[str, Any]] = None,
|
||||||
|
visual_overrides: Optional[Dict[str, Any]] = None,
|
||||||
|
) -> None:
|
||||||
|
"""Add a new result case to the run results.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
level: Result level.
|
||||||
|
category (str): A short tag for the event type.
|
||||||
|
affected_objects (Union[Base, List[Base]]): A single object or a list of
|
||||||
|
objects that are causing the info case.
|
||||||
|
message (Optional[str]): Optional message.
|
||||||
|
metadata: User provided metadata key value pairs
|
||||||
|
visual_overrides: Case specific 3D visual overrides.
|
||||||
|
"""
|
||||||
|
if isinstance(affected_objects, list):
|
||||||
|
if len(affected_objects) < 1:
|
||||||
|
raise ValueError(
|
||||||
|
f"Need atleast one object to report a(n) {level.value.upper()}"
|
||||||
|
)
|
||||||
|
object_list = affected_objects
|
||||||
|
else:
|
||||||
|
object_list = [affected_objects]
|
||||||
|
|
||||||
|
ids: Dict[str, Optional[str]] = {}
|
||||||
|
for o in object_list:
|
||||||
|
# validate that the Base.id is not None. If its a None, throw an Exception
|
||||||
|
if not o.id:
|
||||||
|
raise Exception(
|
||||||
|
f"You can only attach {level} results to objects with an id."
|
||||||
|
)
|
||||||
|
ids[o.id] = o.applicationId
|
||||||
|
print(
|
||||||
|
f"Created new {level.value.upper()}"
|
||||||
|
f" category: {category} caused by: {message}"
|
||||||
|
)
|
||||||
|
self._automation_result.object_results.append(
|
||||||
|
ResultCase(
|
||||||
|
category=category,
|
||||||
|
level=level,
|
||||||
|
object_app_ids=ids,
|
||||||
|
message=message,
|
||||||
|
metadata=metadata,
|
||||||
|
visual_overrides=visual_overrides,
|
||||||
|
)
|
||||||
|
)
|
||||||
@@ -0,0 +1,146 @@
|
|||||||
|
"""Some useful helpers for working with automation data."""
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
from gql import gql
|
||||||
|
from pydantic import Field
|
||||||
|
from pydantic_settings import BaseSettings, SettingsConfigDict
|
||||||
|
|
||||||
|
from speckle_automate.schema import AutomationRunData, TestAutomationRunData
|
||||||
|
from specklepy.api.client import SpeckleClient
|
||||||
|
|
||||||
|
|
||||||
|
class TestAutomationEnvironment(BaseSettings):
|
||||||
|
"""Get known environment variables from local `.env` file"""
|
||||||
|
|
||||||
|
model_config = SettingsConfigDict(
|
||||||
|
env_file=".env",
|
||||||
|
env_file_encoding="utf-8",
|
||||||
|
env_prefix="speckle_",
|
||||||
|
extra="ignore",
|
||||||
|
)
|
||||||
|
|
||||||
|
token: str = Field()
|
||||||
|
server_url: str = Field()
|
||||||
|
project_id: str = Field()
|
||||||
|
automation_id: str = Field()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture()
|
||||||
|
def test_automation_environment() -> TestAutomationEnvironment:
|
||||||
|
return TestAutomationEnvironment()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture()
|
||||||
|
def test_automation_token(
|
||||||
|
test_automation_environment: TestAutomationEnvironment,
|
||||||
|
) -> str:
|
||||||
|
"""Provide a speckle token for the test suite."""
|
||||||
|
|
||||||
|
return test_automation_environment.token
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture()
|
||||||
|
def speckle_client(
|
||||||
|
test_automation_environment: TestAutomationEnvironment,
|
||||||
|
) -> SpeckleClient:
|
||||||
|
"""Initialize a SpeckleClient for testing."""
|
||||||
|
speckle_client = SpeckleClient(
|
||||||
|
test_automation_environment.server_url,
|
||||||
|
test_automation_environment.server_url.startswith("https"),
|
||||||
|
)
|
||||||
|
speckle_client.authenticate_with_token(test_automation_environment.token)
|
||||||
|
return speckle_client
|
||||||
|
|
||||||
|
|
||||||
|
def create_test_automation_run(
|
||||||
|
speckle_client: SpeckleClient, project_id: str, test_automation_id: str
|
||||||
|
) -> TestAutomationRunData:
|
||||||
|
"""Create test run to report local test results to"""
|
||||||
|
|
||||||
|
query = gql(
|
||||||
|
"""
|
||||||
|
mutation CreateTestRun(
|
||||||
|
$projectId: ID!,
|
||||||
|
$automationId: ID!
|
||||||
|
) {
|
||||||
|
projectMutations {
|
||||||
|
automationMutations(projectId: $projectId) {
|
||||||
|
createTestAutomationRun(automationId: $automationId) {
|
||||||
|
automationRunId
|
||||||
|
functionRunId
|
||||||
|
triggers {
|
||||||
|
payload {
|
||||||
|
modelId
|
||||||
|
versionId
|
||||||
|
}
|
||||||
|
triggerType
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"""
|
||||||
|
)
|
||||||
|
|
||||||
|
params = {"automationId": test_automation_id, "projectId": project_id}
|
||||||
|
|
||||||
|
result = speckle_client.httpclient.execute(query, params)
|
||||||
|
|
||||||
|
print(result)
|
||||||
|
|
||||||
|
return (
|
||||||
|
result.get("projectMutations")
|
||||||
|
.get("automationMutations")
|
||||||
|
.get("createTestAutomationRun")
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture()
|
||||||
|
def test_automation_run(
|
||||||
|
speckle_client: SpeckleClient,
|
||||||
|
test_automation_environment: TestAutomationEnvironment,
|
||||||
|
) -> TestAutomationRunData:
|
||||||
|
return create_test_automation_run(
|
||||||
|
speckle_client,
|
||||||
|
test_automation_environment.project_id,
|
||||||
|
test_automation_environment.automation_id,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def create_test_automation_run_data(
|
||||||
|
speckle_client: SpeckleClient,
|
||||||
|
test_automation_environment: TestAutomationEnvironment,
|
||||||
|
) -> AutomationRunData:
|
||||||
|
"""Create automation run data for a new run for a given test automation"""
|
||||||
|
|
||||||
|
test_automation_run_data = create_test_automation_run(
|
||||||
|
speckle_client,
|
||||||
|
test_automation_environment.project_id,
|
||||||
|
test_automation_environment.automation_id,
|
||||||
|
)
|
||||||
|
|
||||||
|
return AutomationRunData(
|
||||||
|
project_id=test_automation_environment.project_id,
|
||||||
|
speckle_server_url=test_automation_environment.server_url,
|
||||||
|
automation_id=test_automation_environment.automation_id,
|
||||||
|
automation_run_id=test_automation_run_data["automationRunId"],
|
||||||
|
function_run_id=test_automation_run_data["functionRunId"],
|
||||||
|
triggers=test_automation_run_data["triggers"],
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture()
|
||||||
|
def test_automation_run_data(
|
||||||
|
speckle_client: SpeckleClient,
|
||||||
|
test_automation_environment: TestAutomationEnvironment,
|
||||||
|
) -> AutomationRunData:
|
||||||
|
return create_test_automation_run_data(speckle_client, test_automation_environment)
|
||||||
|
|
||||||
|
|
||||||
|
__all__ = [
|
||||||
|
"test_automation_environment",
|
||||||
|
"test_automation_token",
|
||||||
|
"speckle_client",
|
||||||
|
"test_automation_run",
|
||||||
|
"test_automation_run_data",
|
||||||
|
]
|
||||||
@@ -0,0 +1,194 @@
|
|||||||
|
"""Function execution module.
|
||||||
|
|
||||||
|
Provides mechanisms to execute any function,
|
||||||
|
that conforms to the AutomateFunction "interface"
|
||||||
|
"""
|
||||||
|
|
||||||
|
import json
|
||||||
|
import sys
|
||||||
|
import traceback
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import Callable, Optional, Tuple, TypeVar, Union, overload
|
||||||
|
|
||||||
|
from pydantic import create_model
|
||||||
|
from pydantic.json_schema import GenerateJsonSchema
|
||||||
|
|
||||||
|
from speckle_automate.automation_context import AutomationContext
|
||||||
|
from speckle_automate.schema import AutomateBase, AutomationRunData, AutomationStatus
|
||||||
|
|
||||||
|
T = TypeVar("T", bound=AutomateBase)
|
||||||
|
|
||||||
|
AutomateFunction = Callable[[AutomationContext, T], None]
|
||||||
|
AutomateFunctionWithoutInputs = Callable[[AutomationContext], None]
|
||||||
|
|
||||||
|
|
||||||
|
def _read_input_data(inputs_location: str) -> str:
|
||||||
|
input_path = Path(inputs_location)
|
||||||
|
if not input_path.exists():
|
||||||
|
raise ValueError(f"Cannot find the function inputs file at {input_path}")
|
||||||
|
|
||||||
|
return input_path.read_text()
|
||||||
|
|
||||||
|
|
||||||
|
def _parse_input_data(
|
||||||
|
input_location: str, input_schema: Optional[type[T]]
|
||||||
|
) -> Tuple[AutomationRunData, Optional[T], str]:
|
||||||
|
input_json_string = _read_input_data(input_location)
|
||||||
|
|
||||||
|
class FunctionRunData(AutomateBase):
|
||||||
|
speckle_token: str
|
||||||
|
automation_run_data: AutomationRunData
|
||||||
|
function_inputs: None = None
|
||||||
|
|
||||||
|
parser_model = FunctionRunData
|
||||||
|
|
||||||
|
if input_schema:
|
||||||
|
parser_model = create_model(
|
||||||
|
"FunctionRunDataWithInputs",
|
||||||
|
function_inputs=(input_schema, ...),
|
||||||
|
__base__=FunctionRunData,
|
||||||
|
)
|
||||||
|
|
||||||
|
input_data = parser_model.model_validate_json(input_json_string)
|
||||||
|
return (
|
||||||
|
input_data.automation_run_data,
|
||||||
|
input_data.function_inputs,
|
||||||
|
input_data.speckle_token,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@overload
|
||||||
|
def execute_automate_function(
|
||||||
|
automate_function: AutomateFunction[T],
|
||||||
|
input_schema: type[T],
|
||||||
|
) -> None: ...
|
||||||
|
|
||||||
|
|
||||||
|
@overload
|
||||||
|
def execute_automate_function(
|
||||||
|
automate_function: AutomateFunctionWithoutInputs,
|
||||||
|
) -> None: ...
|
||||||
|
|
||||||
|
|
||||||
|
class AutomateGenerateJsonSchema(GenerateJsonSchema):
|
||||||
|
def generate(self, schema, mode="validation"):
|
||||||
|
json_schema = super().generate(schema, mode=mode)
|
||||||
|
json_schema["$schema"] = self.schema_dialect
|
||||||
|
return json_schema
|
||||||
|
|
||||||
|
|
||||||
|
def execute_automate_function(
|
||||||
|
automate_function: Union[AutomateFunction[T], AutomateFunctionWithoutInputs],
|
||||||
|
input_schema: Optional[type[T]] = None,
|
||||||
|
):
|
||||||
|
"""Runs the provided automate function with the input schema."""
|
||||||
|
# first arg is the python file name, we do not need that
|
||||||
|
args = sys.argv[1:]
|
||||||
|
|
||||||
|
if len(args) != 2:
|
||||||
|
raise ValueError("Incorrect number of arguments specified need 2")
|
||||||
|
|
||||||
|
# we rely on a command name convention to decide what to do.
|
||||||
|
# this is here, so that the function authors do not see any of this
|
||||||
|
command, argument = args
|
||||||
|
|
||||||
|
if command == "generate_schema":
|
||||||
|
path = Path(argument)
|
||||||
|
schema = json.dumps(
|
||||||
|
input_schema.model_json_schema(
|
||||||
|
by_alias=True, schema_generator=AutomateGenerateJsonSchema
|
||||||
|
)
|
||||||
|
if input_schema
|
||||||
|
else {}
|
||||||
|
)
|
||||||
|
path.write_text(schema)
|
||||||
|
|
||||||
|
elif command == "run":
|
||||||
|
automation_run_data, function_inputs, speckle_token = _parse_input_data(
|
||||||
|
argument, input_schema
|
||||||
|
)
|
||||||
|
|
||||||
|
automation_context = AutomationContext.initialize(
|
||||||
|
automation_run_data, speckle_token
|
||||||
|
)
|
||||||
|
|
||||||
|
if function_inputs:
|
||||||
|
automation_context = run_function(
|
||||||
|
automation_context,
|
||||||
|
automate_function, # type: ignore
|
||||||
|
function_inputs, # type: ignore
|
||||||
|
)
|
||||||
|
|
||||||
|
else:
|
||||||
|
automation_context = AutomationContext.initialize(
|
||||||
|
automation_run_data, speckle_token
|
||||||
|
)
|
||||||
|
automation_context = run_function(
|
||||||
|
automation_context,
|
||||||
|
automate_function, # type: ignore
|
||||||
|
)
|
||||||
|
|
||||||
|
# if we've gotten this far,
|
||||||
|
# the execution should technically be completed as expected
|
||||||
|
# thus exiting with 0 is the schemantically correct thing to do
|
||||||
|
exit_code = (
|
||||||
|
1 if automation_context.run_status == AutomationStatus.EXCEPTION else 0
|
||||||
|
)
|
||||||
|
exit(exit_code)
|
||||||
|
|
||||||
|
else:
|
||||||
|
raise NotImplementedError(f"Command: '{command}' is not supported.")
|
||||||
|
|
||||||
|
|
||||||
|
@overload
|
||||||
|
def run_function(
|
||||||
|
automation_context: AutomationContext,
|
||||||
|
automate_function: AutomateFunction[T],
|
||||||
|
inputs: T,
|
||||||
|
) -> AutomationContext: ...
|
||||||
|
|
||||||
|
|
||||||
|
@overload
|
||||||
|
def run_function(
|
||||||
|
automation_context: AutomationContext,
|
||||||
|
automate_function: AutomateFunctionWithoutInputs,
|
||||||
|
) -> AutomationContext: ...
|
||||||
|
|
||||||
|
|
||||||
|
def run_function(
|
||||||
|
automation_context: AutomationContext,
|
||||||
|
automate_function: Union[AutomateFunction[T], AutomateFunctionWithoutInputs],
|
||||||
|
inputs: Optional[T] = None,
|
||||||
|
) -> AutomationContext:
|
||||||
|
"""Run the provided function with the automate sdk context."""
|
||||||
|
automation_context.report_run_status()
|
||||||
|
|
||||||
|
try:
|
||||||
|
# avoiding complex type gymnastics here on the internals.
|
||||||
|
# the external type overloads make this correct
|
||||||
|
if inputs:
|
||||||
|
automate_function(automation_context, inputs) # type: ignore
|
||||||
|
else:
|
||||||
|
automate_function(automation_context) # type: ignore
|
||||||
|
|
||||||
|
# the function author forgot to mark the function success
|
||||||
|
if automation_context.run_status not in [
|
||||||
|
AutomationStatus.FAILED,
|
||||||
|
AutomationStatus.SUCCEEDED,
|
||||||
|
AutomationStatus.EXCEPTION,
|
||||||
|
]:
|
||||||
|
automation_context.mark_run_success(
|
||||||
|
"WARNING: Automate assumed a success status,"
|
||||||
|
" but it was not marked as so by the function."
|
||||||
|
)
|
||||||
|
except Exception:
|
||||||
|
trace = traceback.format_exc()
|
||||||
|
print(trace)
|
||||||
|
automation_context.mark_run_exception(
|
||||||
|
"Function error. Check the automation run logs for details."
|
||||||
|
)
|
||||||
|
finally:
|
||||||
|
if not automation_context.context_view:
|
||||||
|
automation_context.set_context_view()
|
||||||
|
automation_context.report_run_status()
|
||||||
|
return automation_context
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
""""""
|
||||||
|
|
||||||
|
from enum import Enum
|
||||||
|
from typing import Any, Dict, List, Literal, Optional
|
||||||
|
|
||||||
|
from pydantic import BaseModel, ConfigDict, Field
|
||||||
|
from pydantic.alias_generators import to_camel
|
||||||
|
|
||||||
|
|
||||||
|
class AutomateBase(BaseModel):
|
||||||
|
"""Use this class as a base model for automate related DTO."""
|
||||||
|
|
||||||
|
model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True)
|
||||||
|
|
||||||
|
|
||||||
|
class VersionCreationTriggerPayload(AutomateBase):
|
||||||
|
"""Represents the version creation trigger payload."""
|
||||||
|
|
||||||
|
model_id: str
|
||||||
|
version_id: str
|
||||||
|
|
||||||
|
|
||||||
|
class VersionCreationTrigger(AutomateBase):
|
||||||
|
"""Represents a single version creation trigger for the automation run."""
|
||||||
|
|
||||||
|
trigger_type: Literal["versionCreation"]
|
||||||
|
payload: VersionCreationTriggerPayload
|
||||||
|
|
||||||
|
|
||||||
|
class AutomationRunData(BaseModel):
|
||||||
|
"""Values of the project / model that triggered the run of this function."""
|
||||||
|
|
||||||
|
project_id: str
|
||||||
|
speckle_server_url: str
|
||||||
|
automation_id: str
|
||||||
|
automation_run_id: str
|
||||||
|
function_run_id: str
|
||||||
|
|
||||||
|
triggers: List[VersionCreationTrigger]
|
||||||
|
|
||||||
|
model_config = ConfigDict(
|
||||||
|
alias_generator=to_camel, populate_by_name=True, protected_namespaces=()
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class TestAutomationRunData(BaseModel):
|
||||||
|
"""Values of the run created in the test automation for local test results."""
|
||||||
|
|
||||||
|
automation_run_id: str
|
||||||
|
function_run_id: str
|
||||||
|
|
||||||
|
triggers: List[VersionCreationTrigger]
|
||||||
|
|
||||||
|
model_config = ConfigDict(
|
||||||
|
alias_generator=to_camel, populate_by_name=True, protected_namespaces=()
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class AutomationStatus(str, Enum):
|
||||||
|
"""Set the status of the automation."""
|
||||||
|
|
||||||
|
INITIALIZING = "INITIALIZING"
|
||||||
|
RUNNING = "RUNNING"
|
||||||
|
FAILED = "FAILED"
|
||||||
|
SUCCEEDED = "SUCCEEDED"
|
||||||
|
EXCEPTION = "EXCEPTION"
|
||||||
|
|
||||||
|
|
||||||
|
class ObjectResultLevel(str, Enum):
|
||||||
|
"""Possible status message levels for object reports."""
|
||||||
|
|
||||||
|
SUCCESS = "SUCCESS"
|
||||||
|
INFO = "INFO"
|
||||||
|
WARNING = "WARNING"
|
||||||
|
ERROR = "ERROR"
|
||||||
|
|
||||||
|
|
||||||
|
class ResultCase(AutomateBase):
|
||||||
|
"""A result case."""
|
||||||
|
|
||||||
|
category: str
|
||||||
|
level: ObjectResultLevel
|
||||||
|
object_app_ids: Dict[str, Optional[str]]
|
||||||
|
message: Optional[str]
|
||||||
|
metadata: Optional[Dict[str, Any]]
|
||||||
|
visual_overrides: Optional[Dict[str, Any]]
|
||||||
|
|
||||||
|
|
||||||
|
class AutomationResult(AutomateBase):
|
||||||
|
"""Schema accepted by the Speckle server as a result for an automation run."""
|
||||||
|
|
||||||
|
elapsed: float = 0
|
||||||
|
result_view: Optional[str] = None
|
||||||
|
result_versions: List[str] = Field(default_factory=list)
|
||||||
|
blobs: List[str] = Field(default_factory=list)
|
||||||
|
run_status: AutomationStatus = AutomationStatus.RUNNING
|
||||||
|
status_message: Optional[str] = None
|
||||||
|
object_results: list[ResultCase] = Field(default_factory=list)
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
import json
|
||||||
|
import time
|
||||||
|
import traceback
|
||||||
|
from argparse import ArgumentParser
|
||||||
|
from os import getenv
|
||||||
|
|
||||||
|
from speckleifc.main import open_and_convert_file
|
||||||
|
from specklepy.core.api.client import SpeckleClient
|
||||||
|
from specklepy.logging import metrics
|
||||||
|
|
||||||
|
|
||||||
|
def cmd_line_import() -> None:
|
||||||
|
parser = ArgumentParser(
|
||||||
|
prog="speckleifc",
|
||||||
|
description="imports a file",
|
||||||
|
)
|
||||||
|
parser.add_argument("file_path")
|
||||||
|
parser.add_argument("output_path")
|
||||||
|
parser.add_argument("project_id")
|
||||||
|
parser.add_argument("version_message")
|
||||||
|
parser.add_argument("model_id")
|
||||||
|
# parser.add_argument("model_name")
|
||||||
|
# parser.add_argument("region_name")
|
||||||
|
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
TOKEN = getenv("USER_TOKEN")
|
||||||
|
assert TOKEN is not None
|
||||||
|
SERVER_URL = getenv("SPECKLE_SERVER_URL") or "http://127.0.0.1:3000"
|
||||||
|
|
||||||
|
metrics.set_host_app(
|
||||||
|
"ifc",
|
||||||
|
)
|
||||||
|
|
||||||
|
try:
|
||||||
|
client = SpeckleClient(SERVER_URL, use_ssl=not SERVER_URL.startswith("http://"))
|
||||||
|
client.authenticate_with_token(TOKEN)
|
||||||
|
project = client.project.get(args.project_id)
|
||||||
|
|
||||||
|
version = open_and_convert_file(
|
||||||
|
args.file_path,
|
||||||
|
project,
|
||||||
|
args.version_message,
|
||||||
|
args.model_id,
|
||||||
|
client,
|
||||||
|
)
|
||||||
|
with open(args.output_path, "w") as f:
|
||||||
|
json.dump({"success": True, "commitId": version.id}, f)
|
||||||
|
except Exception as e:
|
||||||
|
error_msg = f"IFC Importer failed with exception:\n{traceback.format_exc()}"
|
||||||
|
print(error_msg)
|
||||||
|
|
||||||
|
# Write error result
|
||||||
|
with open(args.output_path, "w") as f:
|
||||||
|
json.dump({"success": False, "error": str(e)}, f)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
start = time.time()
|
||||||
|
cmd_line_import()
|
||||||
|
print(f"Total time (including cleanup): {(time.time() - start) * 1000}ms")
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
from typing import cast
|
||||||
|
|
||||||
|
from ifcopenshell.entity_instance import entity_instance
|
||||||
|
|
||||||
|
from speckleifc.property_extraction import extract_properties
|
||||||
|
from specklepy.objects.base import Base
|
||||||
|
from specklepy.objects.data_objects import DataObject
|
||||||
|
|
||||||
|
|
||||||
|
def data_object_to_speckle(
|
||||||
|
display_value: list[Base],
|
||||||
|
step_element: entity_instance,
|
||||||
|
children: list[Base],
|
||||||
|
current_storey: str | None = None,
|
||||||
|
) -> DataObject:
|
||||||
|
guid = cast(str, step_element.GlobalId)
|
||||||
|
name = cast(str, step_element.Name or guid)
|
||||||
|
|
||||||
|
properties = extract_properties(step_element)
|
||||||
|
|
||||||
|
# Add building storey information if available and not a building storey itself
|
||||||
|
if current_storey and not step_element.is_a("IfcBuildingStorey"):
|
||||||
|
properties["Building Storey"] = current_storey
|
||||||
|
|
||||||
|
data_object = DataObject(
|
||||||
|
applicationId=guid,
|
||||||
|
properties=properties,
|
||||||
|
name=name or guid,
|
||||||
|
displayValue=display_value,
|
||||||
|
)
|
||||||
|
|
||||||
|
data_object["@elements"] = children
|
||||||
|
data_object["ifcType"] = step_element.is_a()
|
||||||
|
|
||||||
|
return data_object
|
||||||
@@ -0,0 +1,130 @@
|
|||||||
|
from collections import defaultdict
|
||||||
|
from collections.abc import Sequence
|
||||||
|
from typing import cast
|
||||||
|
|
||||||
|
from ifcopenshell.ifcopenshell_wrapper import (
|
||||||
|
Triangulation,
|
||||||
|
TriangulationElement,
|
||||||
|
colour,
|
||||||
|
style,
|
||||||
|
)
|
||||||
|
|
||||||
|
from speckleifc.render_material_proxy_manager import RenderMaterialProxyManager
|
||||||
|
from specklepy.objects.base import Base
|
||||||
|
from specklepy.objects.geometry import Mesh
|
||||||
|
from specklepy.objects.other import RenderMaterial
|
||||||
|
|
||||||
|
|
||||||
|
def geometry_to_speckle(
|
||||||
|
shape: TriangulationElement, render_material_manager: RenderMaterialProxyManager
|
||||||
|
) -> list[Base]:
|
||||||
|
geometry = cast(Triangulation, shape.geometry)
|
||||||
|
materials = cast(Sequence[style], geometry.materials)
|
||||||
|
MESH_COUNT = max(len(materials), 1)
|
||||||
|
|
||||||
|
material_ids = cast(Sequence[int], geometry.material_ids)
|
||||||
|
faces = cast(Sequence[int], geometry.faces)
|
||||||
|
verts = cast(Sequence[float], geometry.verts)
|
||||||
|
normals = cast(Sequence[float], geometry.normals)
|
||||||
|
|
||||||
|
FACE_COUNT = len(material_ids)
|
||||||
|
|
||||||
|
if len(faces) != FACE_COUNT * 3 or FACE_COUNT == 0:
|
||||||
|
# Not really expected, but occasionally some meshes fail to triangulate
|
||||||
|
return []
|
||||||
|
|
||||||
|
mapped_meshes = _pre_alloc_mesh_lists(shape, material_ids, MESH_COUNT)
|
||||||
|
for i, mesh in enumerate(mapped_meshes):
|
||||||
|
material = _material_to_speckle(materials[i])
|
||||||
|
render_material_manager.add_mesh_material_mapping(material, mesh)
|
||||||
|
|
||||||
|
mapped_faces_pointers = [0] * MESH_COUNT
|
||||||
|
mapped_vertices_pointers = [0] * MESH_COUNT
|
||||||
|
mapped_index_counters = [0] * MESH_COUNT
|
||||||
|
|
||||||
|
i = 0
|
||||||
|
face_index = 0
|
||||||
|
while i < FACE_COUNT:
|
||||||
|
mesh_index = material_ids[i]
|
||||||
|
mesh: Mesh = mapped_meshes[mesh_index]
|
||||||
|
|
||||||
|
face_ptr = mapped_faces_pointers[mesh_index]
|
||||||
|
vert_ptr = mapped_vertices_pointers[mesh_index]
|
||||||
|
|
||||||
|
# Add triangle
|
||||||
|
mesh.faces[face_ptr] = 3
|
||||||
|
for j in range(3):
|
||||||
|
# Add vert
|
||||||
|
mesh.faces[face_ptr + 1 + j] = mapped_index_counters[mesh_index] + j
|
||||||
|
vert_index = faces[face_index + j] * 3
|
||||||
|
mapped_vert_offset = vert_ptr + (j * 3)
|
||||||
|
|
||||||
|
mesh.vertices[mapped_vert_offset] = verts[vert_index]
|
||||||
|
mesh.vertices[mapped_vert_offset + 1] = verts[vert_index + 1]
|
||||||
|
mesh.vertices[mapped_vert_offset + 2] = verts[vert_index + 2]
|
||||||
|
|
||||||
|
mesh.vertexNormals[mapped_vert_offset] = normals[vert_index]
|
||||||
|
mesh.vertexNormals[mapped_vert_offset + 1] = normals[vert_index + 1]
|
||||||
|
mesh.vertexNormals[mapped_vert_offset + 2] = normals[vert_index + 2]
|
||||||
|
|
||||||
|
i += 1
|
||||||
|
face_index += 3 # number of items in the faces list we just jumped over
|
||||||
|
|
||||||
|
mapped_index_counters[mesh_index] += (
|
||||||
|
3 # number of verts we just added to the mesh.vertices i.e. the next index
|
||||||
|
)
|
||||||
|
mapped_faces_pointers[mesh_index] += (
|
||||||
|
4 # number of item's we've just added to the mesh.faces list
|
||||||
|
)
|
||||||
|
mapped_vertices_pointers[mesh_index] += (
|
||||||
|
9 # number of item's we've just added to the mesh.vertices list
|
||||||
|
)
|
||||||
|
|
||||||
|
return mapped_meshes # type: ignore
|
||||||
|
|
||||||
|
|
||||||
|
def _material_to_speckle(material: style) -> RenderMaterial:
|
||||||
|
return RenderMaterial(
|
||||||
|
applicationId=material.calc_hash(),
|
||||||
|
name=material.name,
|
||||||
|
diffuse=_color_to_argb(material.diffuse),
|
||||||
|
opacity=1 - material.transparency if material.has_transparency() else 1,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _color_to_argb(colour: colour) -> int:
|
||||||
|
# Clamp values to [0, 1] and convert to 0–255
|
||||||
|
a_int = 255
|
||||||
|
r_int = max(0, min(255, int(round(colour.r() * 255))))
|
||||||
|
g_int = max(0, min(255, int(round(colour.g() * 255))))
|
||||||
|
b_int = max(0, min(255, int(round(colour.b() * 255))))
|
||||||
|
|
||||||
|
return (a_int << 24) | (r_int << 16) | (g_int << 8) | b_int
|
||||||
|
|
||||||
|
|
||||||
|
def _pre_alloc_mesh_lists(
|
||||||
|
shape: TriangulationElement, material_ids: Sequence[int], MESH_COUNT: int
|
||||||
|
) -> list[Mesh]:
|
||||||
|
"""
|
||||||
|
This is a performance optimisation to pre-size the lists
|
||||||
|
since we're expecting potential hundreds of thousands of verts in a single model
|
||||||
|
This is very much in the hot path, so worth the extra bit of convoluted logic
|
||||||
|
"""
|
||||||
|
appId = cast(str, shape.guid)
|
||||||
|
|
||||||
|
material_face_counts = defaultdict(int)
|
||||||
|
for mat_id in material_ids:
|
||||||
|
material_face_counts[mat_id] += 1
|
||||||
|
|
||||||
|
meshes = []
|
||||||
|
for mat_id in range(MESH_COUNT):
|
||||||
|
face_count = material_face_counts.get(mat_id, 0)
|
||||||
|
mesh = Mesh(
|
||||||
|
units="m",
|
||||||
|
vertices=[-1] * (face_count * 9),
|
||||||
|
vertexNormals=[-1] * (face_count * 9),
|
||||||
|
faces=[-1] * (face_count * 4), # 1 marker + 3 vertex indices
|
||||||
|
applicationId=f"{appId}_mat{mat_id}",
|
||||||
|
)
|
||||||
|
meshes.append(mesh)
|
||||||
|
return meshes
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
from typing import cast
|
||||||
|
|
||||||
|
from ifcopenshell.entity_instance import entity_instance
|
||||||
|
|
||||||
|
from specklepy.objects.base import Base
|
||||||
|
from specklepy.objects.models.collections.collection import Collection
|
||||||
|
|
||||||
|
|
||||||
|
def project_to_speckle(
|
||||||
|
step_element: entity_instance, children: list[Base]
|
||||||
|
) -> Collection:
|
||||||
|
guid = cast(str, step_element.GlobalId)
|
||||||
|
name = cast(str, step_element.Name or step_element.LongName or guid)
|
||||||
|
|
||||||
|
project = Collection(applicationId=guid, name=name, elements=children)
|
||||||
|
|
||||||
|
project["ifcType"] = step_element.is_a()
|
||||||
|
project["description"] = step_element.Description
|
||||||
|
project["objectType"] = step_element.ObjectType
|
||||||
|
project["longName"] = step_element.LongName
|
||||||
|
project["phase"] = step_element.Phase
|
||||||
|
|
||||||
|
return project
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
from typing import cast
|
||||||
|
|
||||||
|
from ifcopenshell.entity_instance import entity_instance
|
||||||
|
|
||||||
|
from speckleifc.property_extraction import extract_properties
|
||||||
|
from specklepy.objects.base import Base
|
||||||
|
from specklepy.objects.data_objects import DataObject
|
||||||
|
from specklepy.objects.models.collections.collection import Collection
|
||||||
|
|
||||||
|
|
||||||
|
def spatial_element_to_speckle(
|
||||||
|
display_value: list[Base],
|
||||||
|
step_element: entity_instance,
|
||||||
|
relational_children: list[Base],
|
||||||
|
current_storey: str | None = None,
|
||||||
|
) -> Collection:
|
||||||
|
direct_geometry = _convert_as_data_object(
|
||||||
|
display_value, step_element, current_storey
|
||||||
|
)
|
||||||
|
all_children = [direct_geometry] + relational_children
|
||||||
|
|
||||||
|
guid = cast(str, step_element.GlobalId)
|
||||||
|
name = cast(str, step_element.Name or step_element.LongName or guid)
|
||||||
|
|
||||||
|
data_object = Collection(applicationId=guid, name=name, elements=all_children)
|
||||||
|
data_object["ifcType"] = step_element.is_a()
|
||||||
|
|
||||||
|
return data_object
|
||||||
|
|
||||||
|
|
||||||
|
def _convert_as_data_object(
|
||||||
|
display_value: list[Base],
|
||||||
|
step_element: entity_instance,
|
||||||
|
current_storey: str | None = None,
|
||||||
|
) -> DataObject:
|
||||||
|
guid = cast(str, step_element.GlobalId)
|
||||||
|
name = cast(str, step_element.Name or step_element.LongName or guid)
|
||||||
|
|
||||||
|
properties = extract_properties(step_element)
|
||||||
|
|
||||||
|
# Add building storey information if available and not a building storey itself
|
||||||
|
if current_storey and not step_element.is_a("IfcBuildingStorey"):
|
||||||
|
properties["Building Storey"] = current_storey
|
||||||
|
|
||||||
|
data_object = DataObject(
|
||||||
|
applicationId=guid,
|
||||||
|
properties=properties,
|
||||||
|
name=name,
|
||||||
|
displayValue=display_value,
|
||||||
|
)
|
||||||
|
|
||||||
|
data_object["ifcType"] = step_element.is_a()
|
||||||
|
|
||||||
|
return data_object
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
import multiprocessing
|
||||||
|
|
||||||
|
from ifcopenshell import SchemaError, file, ifcopenshell_wrapper, open, sqlite
|
||||||
|
from ifcopenshell.geom import iterator, settings
|
||||||
|
|
||||||
|
from specklepy.logging.exceptions import SpeckleException
|
||||||
|
|
||||||
|
|
||||||
|
def _create_iterator_settings() -> settings:
|
||||||
|
ifc_settings = settings()
|
||||||
|
# triangles for now, speckle does support n-gons, but may be less performant
|
||||||
|
ifc_settings.set("triangulation-type", ifcopenshell_wrapper.TRIANGLE_MESH)
|
||||||
|
# no need to weld verts
|
||||||
|
ifc_settings.set("weld-vertices", False)
|
||||||
|
# Speckle meshes are all in world coords
|
||||||
|
ifc_settings.set("use-world-coords", True)
|
||||||
|
# Tiny performance improvement,
|
||||||
|
ifc_settings.set("no-wire-intersection-check", True)
|
||||||
|
# Rendermaterials inherit the material names instead of type + unique id
|
||||||
|
ifc_settings.set("use-material-names", True)
|
||||||
|
|
||||||
|
# IfcOpenshell defaults to 0.001mm here, which leads to very dense meshes.
|
||||||
|
# lowering the mesh quality a bit here leads to meshes
|
||||||
|
# that are still much higher quality than webifc
|
||||||
|
|
||||||
|
# We still need to experiment with the affect on memory usage
|
||||||
|
# It may be desirable to lower this further, and increase the angular deflection
|
||||||
|
# to compensate. This would allow large meshes to be lower quality,
|
||||||
|
# while keeping small meshes relatively similar.
|
||||||
|
ifc_settings.set("mesher-linear-deflection", 0.2)
|
||||||
|
|
||||||
|
return ifc_settings
|
||||||
|
|
||||||
|
|
||||||
|
def open_ifc(file_path: str) -> file:
|
||||||
|
try:
|
||||||
|
ifc_file = open(file_path)
|
||||||
|
except SchemaError:
|
||||||
|
raise
|
||||||
|
except FileNotFoundError:
|
||||||
|
raise
|
||||||
|
except Exception as ex:
|
||||||
|
raise SpeckleException("File could not be opened as an IFC file") from ex
|
||||||
|
|
||||||
|
if isinstance(ifc_file, file):
|
||||||
|
return ifc_file
|
||||||
|
else:
|
||||||
|
raise SpeckleException(f"file at {file_path} is not a compatible ifc file type")
|
||||||
|
|
||||||
|
|
||||||
|
def create_geometry_iterator(ifc_file: file | sqlite) -> iterator:
|
||||||
|
return iterator(_create_iterator_settings(), ifc_file, multiprocessing.cpu_count())
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
from collections.abc import Generator, Iterable
|
||||||
|
from itertools import chain
|
||||||
|
from typing import cast
|
||||||
|
|
||||||
|
from ifcopenshell.entity_instance import entity_instance
|
||||||
|
|
||||||
|
|
||||||
|
def get_children(step_element: entity_instance) -> Generator[entity_instance]:
|
||||||
|
yield from chain(
|
||||||
|
get_spatial_children(step_element), get_aggregate_children(step_element)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def get_spatial_children(step_element: entity_instance) -> Generator[entity_instance]:
|
||||||
|
spatial_relations = cast(
|
||||||
|
Iterable[entity_instance] | None,
|
||||||
|
getattr(step_element, "ContainsElements", None),
|
||||||
|
)
|
||||||
|
if spatial_relations is not None:
|
||||||
|
for relation in spatial_relations:
|
||||||
|
yield from cast(Iterable[entity_instance], relation.RelatedElements)
|
||||||
|
|
||||||
|
|
||||||
|
def get_aggregate_children(step_element: entity_instance) -> Generator[entity_instance]:
|
||||||
|
aggregate_relations = cast(
|
||||||
|
Iterable[entity_instance] | None,
|
||||||
|
getattr(step_element, "IsDecomposedBy", None),
|
||||||
|
)
|
||||||
|
if aggregate_relations is not None:
|
||||||
|
for relation in aggregate_relations:
|
||||||
|
yield from cast(Iterable[entity_instance], relation.RelatedObjects)
|
||||||
@@ -0,0 +1,155 @@
|
|||||||
|
import time
|
||||||
|
from dataclasses import dataclass, field
|
||||||
|
from typing import cast
|
||||||
|
|
||||||
|
from ifcopenshell.entity_instance import entity_instance
|
||||||
|
from ifcopenshell.geom import file
|
||||||
|
from ifcopenshell.ifcopenshell_wrapper import TriangulationElement
|
||||||
|
|
||||||
|
from speckleifc.converter.data_object_converter import data_object_to_speckle
|
||||||
|
from speckleifc.converter.geometry_converter import geometry_to_speckle
|
||||||
|
from speckleifc.converter.project_converter import project_to_speckle
|
||||||
|
from speckleifc.converter.spatial_element_converter import spatial_element_to_speckle
|
||||||
|
from speckleifc.ifc_geometry_processing import create_geometry_iterator
|
||||||
|
from speckleifc.ifc_openshell_helpers import get_children
|
||||||
|
from speckleifc.level_proxy_manager import LevelProxyManager
|
||||||
|
from speckleifc.render_material_proxy_manager import RenderMaterialProxyManager
|
||||||
|
from specklepy.logging.exceptions import SpeckleException
|
||||||
|
from specklepy.objects import Base
|
||||||
|
from specklepy.objects.data_objects import DataObject
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class ImportJob:
|
||||||
|
ifc_file: file
|
||||||
|
cached_display_values: dict[int, list[Base]] = field(default_factory=dict) # noqa: F821
|
||||||
|
_render_material_manager: RenderMaterialProxyManager = field(
|
||||||
|
default_factory=lambda: RenderMaterialProxyManager()
|
||||||
|
)
|
||||||
|
_level_proxy_manager: LevelProxyManager = field(
|
||||||
|
default_factory=lambda: LevelProxyManager()
|
||||||
|
)
|
||||||
|
geometries_count: int = 0
|
||||||
|
geometries_used: int = 0
|
||||||
|
_current_storey_data_object: DataObject | None = field(default=None, init=False)
|
||||||
|
|
||||||
|
def convert_element(self, step_element: entity_instance) -> Base:
|
||||||
|
try:
|
||||||
|
return self._convert_element(step_element)
|
||||||
|
except SpeckleException:
|
||||||
|
raise
|
||||||
|
except Exception as ex:
|
||||||
|
raise SpeckleException(
|
||||||
|
f"Failed to convert {step_element.is_a()} #{step_element.id()}"
|
||||||
|
) from ex
|
||||||
|
|
||||||
|
def _convert_element(self, step_element: entity_instance) -> Base:
|
||||||
|
# Track current storey context and store for level proxies
|
||||||
|
previous_storey_data_object = self._current_storey_data_object
|
||||||
|
if step_element.is_a("IfcBuildingStorey"):
|
||||||
|
# Convert the building storey to a DataObject for the level proxy
|
||||||
|
storey_display_value = self.cached_display_values.get(step_element.id(), [])
|
||||||
|
self._current_storey_data_object = data_object_to_speckle(
|
||||||
|
storey_display_value, step_element, []
|
||||||
|
)
|
||||||
|
|
||||||
|
children = self._convert_children(step_element)
|
||||||
|
display_value = self.cached_display_values.get(step_element.id(), [])
|
||||||
|
|
||||||
|
if display_value is not None:
|
||||||
|
self.geometries_used += 1
|
||||||
|
|
||||||
|
# Extract current storey name from DataObject if available
|
||||||
|
current_storey_name = (
|
||||||
|
self._current_storey_data_object.name
|
||||||
|
if self._current_storey_data_object
|
||||||
|
else None
|
||||||
|
)
|
||||||
|
|
||||||
|
if step_element.is_a("IfcProject"):
|
||||||
|
result = project_to_speckle(step_element, children)
|
||||||
|
elif step_element.is_a("IfcSpatialStructureElement"):
|
||||||
|
result = spatial_element_to_speckle(
|
||||||
|
display_value, step_element, children, current_storey_name
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
result = data_object_to_speckle(
|
||||||
|
display_value, step_element, children, current_storey_name
|
||||||
|
)
|
||||||
|
# Associate non-spatial elements with current storey for level proxies
|
||||||
|
if self._current_storey_data_object is not None and result.applicationId:
|
||||||
|
self._level_proxy_manager.add_element_level_mapping(
|
||||||
|
self._current_storey_data_object, result.applicationId
|
||||||
|
)
|
||||||
|
|
||||||
|
# Restore previous storey context
|
||||||
|
self._current_storey_data_object = previous_storey_data_object
|
||||||
|
return result
|
||||||
|
|
||||||
|
def _convert_children(self, step_element: entity_instance) -> list[Base]:
|
||||||
|
return [
|
||||||
|
self.convert_element(i)
|
||||||
|
for i in get_children(step_element)
|
||||||
|
if self._should_convert(i)
|
||||||
|
]
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _should_convert(step_element: entity_instance) -> bool:
|
||||||
|
# We only consider IfcRoot objects convertible
|
||||||
|
# This is the super class for root level entities that have a GUID...
|
||||||
|
# This will ignore some types like IfcGridAxis
|
||||||
|
s = step_element.is_a("IfcRoot")
|
||||||
|
if not s:
|
||||||
|
print(
|
||||||
|
f"Skipping #{step_element.id()} because it's type ({step_element.is_a()}) it not an IfcRoot" # noqa: E501
|
||||||
|
)
|
||||||
|
return s
|
||||||
|
|
||||||
|
def convert(self) -> Base:
|
||||||
|
start = time.time()
|
||||||
|
self.pre_process_geometry()
|
||||||
|
print(f"Geometry conversion complete after {(time.time() - start) * 1000}ms")
|
||||||
|
print(f"Created {self.geometries_count} geometries")
|
||||||
|
|
||||||
|
start = time.time()
|
||||||
|
root = self._convert_project_tree()
|
||||||
|
print(f"Object tree conversion complete after {(time.time() - start) * 1000}ms")
|
||||||
|
print(f"Used {self.geometries_used} geometries")
|
||||||
|
return root
|
||||||
|
|
||||||
|
def pre_process_geometry(self) -> None:
|
||||||
|
iterator = create_geometry_iterator(self.ifc_file)
|
||||||
|
if not iterator.initialize():
|
||||||
|
raise SpeckleException("Failed to find any geometry in file")
|
||||||
|
self.geometries_count = 0
|
||||||
|
while True:
|
||||||
|
shape = cast(TriangulationElement, iterator.get())
|
||||||
|
self.geometries_count += 1
|
||||||
|
id = cast(int, shape.id)
|
||||||
|
|
||||||
|
try:
|
||||||
|
display_value = geometry_to_speckle(
|
||||||
|
shape, self._render_material_manager
|
||||||
|
)
|
||||||
|
self.cached_display_values[id] = display_value
|
||||||
|
except Exception as ex:
|
||||||
|
raise SpeckleException(
|
||||||
|
f"Failed to convert geometry with id: {id}"
|
||||||
|
) from ex
|
||||||
|
if not iterator.next():
|
||||||
|
break
|
||||||
|
|
||||||
|
def _convert_project_tree(self) -> Base:
|
||||||
|
projects = self.ifc_file.by_type("IfcProject", False)
|
||||||
|
if len(projects) != 1:
|
||||||
|
raise SpeckleException("Expected exactly one IfcProject in file")
|
||||||
|
project = projects[0]
|
||||||
|
|
||||||
|
tree = self.convert_element(project)
|
||||||
|
tree["renderMaterialProxies"] = list(
|
||||||
|
self._render_material_manager.render_material_proxies.values()
|
||||||
|
)
|
||||||
|
tree["levelProxies"] = list(self._level_proxy_manager.level_proxies.values())
|
||||||
|
tree["version"] = 3
|
||||||
|
|
||||||
|
return tree
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
from specklepy.objects.data_objects import DataObject
|
||||||
|
from specklepy.objects.proxies import LevelProxy
|
||||||
|
|
||||||
|
|
||||||
|
class LevelProxyManager:
|
||||||
|
def __init__(self):
|
||||||
|
self._level_proxies: dict[str, LevelProxy] = {}
|
||||||
|
|
||||||
|
@property
|
||||||
|
def level_proxies(self):
|
||||||
|
return self._level_proxies
|
||||||
|
|
||||||
|
def add_element_level_mapping(
|
||||||
|
self, level_data_object: DataObject, element_application_id: str
|
||||||
|
) -> None:
|
||||||
|
level_id = level_data_object.applicationId
|
||||||
|
assert level_id is not None
|
||||||
|
|
||||||
|
proxy = self._level_proxies.get(level_id, None)
|
||||||
|
if proxy is not None:
|
||||||
|
proxy.objects.append(element_application_id)
|
||||||
|
else:
|
||||||
|
self._level_proxies[level_id] = LevelProxy(
|
||||||
|
objects=[element_application_id],
|
||||||
|
value=level_data_object,
|
||||||
|
applicationId=level_id,
|
||||||
|
)
|
||||||
@@ -0,0 +1,621 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
@@ -0,0 +1,165 @@
|
|||||||
|
GNU LESSER GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
|
||||||
|
This version of the GNU Lesser General Public License incorporates
|
||||||
|
the terms and conditions of version 3 of the GNU General Public
|
||||||
|
License, supplemented by the additional permissions listed below.
|
||||||
|
|
||||||
|
0. Additional Definitions.
|
||||||
|
|
||||||
|
As used herein, "this License" refers to version 3 of the GNU Lesser
|
||||||
|
General Public License, and the "GNU GPL" refers to version 3 of the GNU
|
||||||
|
General Public License.
|
||||||
|
|
||||||
|
"The Library" refers to a covered work governed by this License,
|
||||||
|
other than an Application or a Combined Work as defined below.
|
||||||
|
|
||||||
|
An "Application" is any work that makes use of an interface provided
|
||||||
|
by the Library, but which is not otherwise based on the Library.
|
||||||
|
Defining a subclass of a class defined by the Library is deemed a mode
|
||||||
|
of using an interface provided by the Library.
|
||||||
|
|
||||||
|
A "Combined Work" is a work produced by combining or linking an
|
||||||
|
Application with the Library. The particular version of the Library
|
||||||
|
with which the Combined Work was made is also called the "Linked
|
||||||
|
Version".
|
||||||
|
|
||||||
|
The "Minimal Corresponding Source" for a Combined Work means the
|
||||||
|
Corresponding Source for the Combined Work, excluding any source code
|
||||||
|
for portions of the Combined Work that, considered in isolation, are
|
||||||
|
based on the Application, and not on the Linked Version.
|
||||||
|
|
||||||
|
The "Corresponding Application Code" for a Combined Work means the
|
||||||
|
object code and/or source code for the Application, including any data
|
||||||
|
and utility programs needed for reproducing the Combined Work from the
|
||||||
|
Application, but excluding the System Libraries of the Combined Work.
|
||||||
|
|
||||||
|
1. Exception to Section 3 of the GNU GPL.
|
||||||
|
|
||||||
|
You may convey a covered work under sections 3 and 4 of this License
|
||||||
|
without being bound by section 3 of the GNU GPL.
|
||||||
|
|
||||||
|
2. Conveying Modified Versions.
|
||||||
|
|
||||||
|
If you modify a copy of the Library, and, in your modifications, a
|
||||||
|
facility refers to a function or data to be supplied by an Application
|
||||||
|
that uses the facility (other than as an argument passed when the
|
||||||
|
facility is invoked), then you may convey a copy of the modified
|
||||||
|
version:
|
||||||
|
|
||||||
|
a) under this License, provided that you make a good faith effort to
|
||||||
|
ensure that, in the event an Application does not supply the
|
||||||
|
function or data, the facility still operates, and performs
|
||||||
|
whatever part of its purpose remains meaningful, or
|
||||||
|
|
||||||
|
b) under the GNU GPL, with none of the additional permissions of
|
||||||
|
this License applicable to that copy.
|
||||||
|
|
||||||
|
3. Object Code Incorporating Material from Library Header Files.
|
||||||
|
|
||||||
|
The object code form of an Application may incorporate material from
|
||||||
|
a header file that is part of the Library. You may convey such object
|
||||||
|
code under terms of your choice, provided that, if the incorporated
|
||||||
|
material is not limited to numerical parameters, data structure
|
||||||
|
layouts and accessors, or small macros, inline functions and templates
|
||||||
|
(ten or fewer lines in length), you do both of the following:
|
||||||
|
|
||||||
|
a) Give prominent notice with each copy of the object code that the
|
||||||
|
Library is used in it and that the Library and its use are
|
||||||
|
covered by this License.
|
||||||
|
|
||||||
|
b) Accompany the object code with a copy of the GNU GPL and this license
|
||||||
|
document.
|
||||||
|
|
||||||
|
4. Combined Works.
|
||||||
|
|
||||||
|
You may convey a Combined Work under terms of your choice that,
|
||||||
|
taken together, effectively do not restrict modification of the
|
||||||
|
portions of the Library contained in the Combined Work and reverse
|
||||||
|
engineering for debugging such modifications, if you also do each of
|
||||||
|
the following:
|
||||||
|
|
||||||
|
a) Give prominent notice with each copy of the Combined Work that
|
||||||
|
the Library is used in it and that the Library and its use are
|
||||||
|
covered by this License.
|
||||||
|
|
||||||
|
b) Accompany the Combined Work with a copy of the GNU GPL and this license
|
||||||
|
document.
|
||||||
|
|
||||||
|
c) For a Combined Work that displays copyright notices during
|
||||||
|
execution, include the copyright notice for the Library among
|
||||||
|
these notices, as well as a reference directing the user to the
|
||||||
|
copies of the GNU GPL and this license document.
|
||||||
|
|
||||||
|
d) Do one of the following:
|
||||||
|
|
||||||
|
0) Convey the Minimal Corresponding Source under the terms of this
|
||||||
|
License, and the Corresponding Application Code in a form
|
||||||
|
suitable for, and under terms that permit, the user to
|
||||||
|
recombine or relink the Application with a modified version of
|
||||||
|
the Linked Version to produce a modified Combined Work, in the
|
||||||
|
manner specified by section 6 of the GNU GPL for conveying
|
||||||
|
Corresponding Source.
|
||||||
|
|
||||||
|
1) Use a suitable shared library mechanism for linking with the
|
||||||
|
Library. A suitable mechanism is one that (a) uses at run time
|
||||||
|
a copy of the Library already present on the user's computer
|
||||||
|
system, and (b) will operate properly with a modified version
|
||||||
|
of the Library that is interface-compatible with the Linked
|
||||||
|
Version.
|
||||||
|
|
||||||
|
e) Provide Installation Information, but only if you would otherwise
|
||||||
|
be required to provide such information under section 6 of the
|
||||||
|
GNU GPL, and only to the extent that such information is
|
||||||
|
necessary to install and execute a modified version of the
|
||||||
|
Combined Work produced by recombining or relinking the
|
||||||
|
Application with a modified version of the Linked Version. (If
|
||||||
|
you use option 4d0, the Installation Information must accompany
|
||||||
|
the Minimal Corresponding Source and Corresponding Application
|
||||||
|
Code. If you use option 4d1, you must provide the Installation
|
||||||
|
Information in the manner specified by section 6 of the GNU GPL
|
||||||
|
for conveying Corresponding Source.)
|
||||||
|
|
||||||
|
5. Combined Libraries.
|
||||||
|
|
||||||
|
You may place library facilities that are a work based on the
|
||||||
|
Library side by side in a single library together with other library
|
||||||
|
facilities that are not Applications and are not covered by this
|
||||||
|
License, and convey such a combined library under terms of your
|
||||||
|
choice, if you do both of the following:
|
||||||
|
|
||||||
|
a) Accompany the combined library with a copy of the same work based
|
||||||
|
on the Library, uncombined with any other library facilities,
|
||||||
|
conveyed under the terms of this License.
|
||||||
|
|
||||||
|
b) Give prominent notice with the combined library that part of it
|
||||||
|
is a work based on the Library, and explaining where to find the
|
||||||
|
accompanying uncombined form of the same work.
|
||||||
|
|
||||||
|
6. Revised Versions of the GNU Lesser General Public License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions
|
||||||
|
of the GNU Lesser General Public License from time to time. Such new
|
||||||
|
versions will be similar in spirit to the present version, but may
|
||||||
|
differ in detail to address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Library as you received it specifies that a certain numbered version
|
||||||
|
of the GNU Lesser General Public License "or any later version"
|
||||||
|
applies to it, you have the option of following the terms and
|
||||||
|
conditions either of that published version or of any later version
|
||||||
|
published by the Free Software Foundation. If the Library as you
|
||||||
|
received it does not specify a version number of the GNU Lesser
|
||||||
|
General Public License, you may choose any version of the GNU Lesser
|
||||||
|
General Public License ever published by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Library as you received it specifies that a proxy can decide
|
||||||
|
whether future versions of the GNU Lesser General Public License shall
|
||||||
|
apply, that proxy's public statement of acceptance of any version is
|
||||||
|
permanent authorization for you to choose that version for the
|
||||||
|
Library.
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
# Third-Party Licenses
|
||||||
|
|
||||||
|
This directory contains license files for third-party dependencies used by specklepy.
|
||||||
|
|
||||||
|
## IfcOpenShell
|
||||||
|
|
||||||
|
IfcOpenShell is an optional dependency available through the `speckleifc` extra:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
pip install specklepy[speckleifc]
|
||||||
|
```
|
||||||
|
|
||||||
|
IfcOpenShell is dual-licensed under:
|
||||||
|
|
||||||
|
- **LGPL-3.0** (`IfcOpenShell-LGPL-3.0.txt`) - GNU Lesser General Public License v3.0
|
||||||
|
- **GPL-3.0** (`IfcOpenShell-GPL-3.0.txt`) - GNU General Public License v3.0
|
||||||
|
|
||||||
|
### About IfcOpenShell
|
||||||
|
|
||||||
|
IfcOpenShell is an open source software library for working with Industry Foundation Classes (IFC). It provides complete parsing support for IFC2x3 TC1, IFC4 Add2 TC1, IFC4x1, IFC4x2, and IFC4x3 Add2.
|
||||||
|
|
||||||
|
- **Project**: https://github.com/IfcOpenShell/IfcOpenShell
|
||||||
|
- **Documentation**: https://docs.ifcopenshell.org/
|
||||||
|
- **License**: LGPL-3.0-or-later, GPL-3.0-or-later
|
||||||
|
|
||||||
|
When using specklepy with IfcOpenShell, you must comply with the terms of these licenses.
|
||||||
|
|
||||||
|
## License Compatibility
|
||||||
|
|
||||||
|
specklepy is licensed under Apache-2.0, which is compatible with LGPL-3.0 for dynamic linking scenarios (which is how IfcOpenShell is used as an optional dependency).
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
import time
|
||||||
|
|
||||||
|
from speckleifc.ifc_geometry_processing import open_ifc
|
||||||
|
from speckleifc.importer import ImportJob
|
||||||
|
from specklepy.core.api.client import SpeckleClient
|
||||||
|
from specklepy.core.api.inputs.version_inputs import CreateVersionInput
|
||||||
|
from specklepy.core.api.models.current import Project, Version
|
||||||
|
from specklepy.core.api.operations import send
|
||||||
|
from specklepy.logging import metrics
|
||||||
|
from specklepy.transports.server import ServerTransport
|
||||||
|
|
||||||
|
|
||||||
|
def open_and_convert_file(
|
||||||
|
file_path: str,
|
||||||
|
project: Project,
|
||||||
|
version_message: str | None,
|
||||||
|
model_id: str,
|
||||||
|
client: SpeckleClient,
|
||||||
|
) -> Version:
|
||||||
|
start = time.time()
|
||||||
|
very_start = start
|
||||||
|
|
||||||
|
account = client.account
|
||||||
|
server_url = account.serverInfo.url
|
||||||
|
assert server_url
|
||||||
|
remote_transport = ServerTransport(project.id, account=account)
|
||||||
|
|
||||||
|
ifc_file = open_ifc(file_path) # pyright: ignore[reportUnknownVariableType]
|
||||||
|
|
||||||
|
import_job = ImportJob(ifc_file) # pyright: ignore[reportUnknownArgumentType]
|
||||||
|
data = import_job.convert()
|
||||||
|
|
||||||
|
print(f"File conversion complete after {(time.time() - start) * 1000}ms")
|
||||||
|
|
||||||
|
start = time.time()
|
||||||
|
|
||||||
|
root_id = send(data, transports=[remote_transport], use_default_cache=False)
|
||||||
|
print(f"Sending to speckle complete after: {(time.time() - start) * 1000}ms")
|
||||||
|
|
||||||
|
start = time.time()
|
||||||
|
|
||||||
|
create_version = CreateVersionInput(
|
||||||
|
object_id=root_id,
|
||||||
|
model_id=model_id,
|
||||||
|
project_id=project.id,
|
||||||
|
message=version_message,
|
||||||
|
source_application="ifc",
|
||||||
|
)
|
||||||
|
version = client.version.create(create_version)
|
||||||
|
end = time.time()
|
||||||
|
print(f"Version committed after: {(end - start) * 1000}ms")
|
||||||
|
|
||||||
|
print(f"Total time (to commit): {(end - very_start) * 1000}ms")
|
||||||
|
del ifc_file
|
||||||
|
|
||||||
|
custom_properties = {"ui": "dui3", "actionSource": "import"}
|
||||||
|
if project.workspace_id:
|
||||||
|
custom_properties["workspace_id"] = project.workspace_id
|
||||||
|
metrics.track(metrics.SEND, account, custom_properties)
|
||||||
|
|
||||||
|
return version
|
||||||
@@ -0,0 +1,192 @@
|
|||||||
|
from typing import Any, Tuple
|
||||||
|
|
||||||
|
from ifcopenshell.entity_instance import entity_instance
|
||||||
|
from ifcopenshell.util.element import get_type
|
||||||
|
from ifcopenshell.util.unit import get_full_unit_name, get_project_unit
|
||||||
|
|
||||||
|
UNIT_MAPPING = {
|
||||||
|
"IfcQuantityLength": "LENGTHUNIT",
|
||||||
|
"IfcQuantityArea": "AREAUNIT",
|
||||||
|
"IfcQuantityVolume": "VOLUMEUNIT",
|
||||||
|
"IfcQuantityCount": None, # Count quantities have no units
|
||||||
|
"IfcQuantityWeight": "MASSUNIT",
|
||||||
|
"IfcQuantityTime": "TIMEUNIT",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def extract_properties(element: entity_instance) -> dict[str, object]:
|
||||||
|
(psets, qtos) = _get_ifc_object_properties(element)
|
||||||
|
|
||||||
|
properties: dict[str, object] = {
|
||||||
|
"Attributes": _get_attributes(element),
|
||||||
|
"Property Sets": psets,
|
||||||
|
}
|
||||||
|
|
||||||
|
if qtos:
|
||||||
|
properties["Quantities"] = qtos
|
||||||
|
|
||||||
|
if (ifc_type := get_type(element)) is not None:
|
||||||
|
properties["Element Type Property Sets"] = _get_ifc_element_type_properties(
|
||||||
|
ifc_type,
|
||||||
|
)
|
||||||
|
properties["Element Type Attributes"] = _get_attributes(
|
||||||
|
ifc_type,
|
||||||
|
)
|
||||||
|
|
||||||
|
return properties
|
||||||
|
|
||||||
|
|
||||||
|
def _get_attributes(element: entity_instance) -> dict[str, object]:
|
||||||
|
return element.get_info(True, False, scalar_only=True)
|
||||||
|
|
||||||
|
|
||||||
|
def _get_ifc_element_type_properties(element: entity_instance) -> dict[str, object]:
|
||||||
|
result: dict[str, object] = {}
|
||||||
|
for definition in element.HasPropertySets or []:
|
||||||
|
if not definition.is_a("IfcPropertySet"):
|
||||||
|
continue
|
||||||
|
|
||||||
|
result[definition.Name] = _get_properties(definition.HasProperties)
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
def _get_ifc_object_properties(
|
||||||
|
element: entity_instance,
|
||||||
|
) -> Tuple[dict[str, object], dict[str, object]]:
|
||||||
|
psets: dict[str, object] = {}
|
||||||
|
qtos: dict[str, object] = {}
|
||||||
|
|
||||||
|
for rel in getattr(element, "IsDefinedBy", []):
|
||||||
|
if not rel.is_a("IfcRelDefinesByProperties"):
|
||||||
|
continue
|
||||||
|
|
||||||
|
definition: entity_instance | None = rel.RelatingPropertyDefinition
|
||||||
|
if not definition:
|
||||||
|
continue
|
||||||
|
|
||||||
|
try:
|
||||||
|
if definition.is_a("IfcPropertySet"):
|
||||||
|
set_name = definition.Name
|
||||||
|
properties = _get_properties(definition.HasProperties)
|
||||||
|
|
||||||
|
if properties:
|
||||||
|
psets[set_name] = properties
|
||||||
|
|
||||||
|
elif definition.is_a("IfcElementQuantity"):
|
||||||
|
quantities_data = _get_quantities(definition.Quantities, element)
|
||||||
|
if not quantities_data:
|
||||||
|
continue
|
||||||
|
quantities_data["id"] = definition.id()
|
||||||
|
qtos[definition.Name] = quantities_data
|
||||||
|
|
||||||
|
except (KeyError, AttributeError):
|
||||||
|
# If entity access fails, skip this quantity set
|
||||||
|
print(f"Skipping {definition}")
|
||||||
|
continue
|
||||||
|
|
||||||
|
return (psets, qtos)
|
||||||
|
|
||||||
|
|
||||||
|
def _get_properties(properties: entity_instance) -> dict[str, Any]:
|
||||||
|
"""
|
||||||
|
There already exists a canonical way to get properties
|
||||||
|
`ifcopenshell.util.element.get_properties` but it's very verbose
|
||||||
|
and we don't want to bloat our selves with supporting complex property types
|
||||||
|
|
||||||
|
This is a slimmed down version, only supporting a couple of property types
|
||||||
|
"""
|
||||||
|
result: dict[str, Any] = {}
|
||||||
|
|
||||||
|
for prop in properties:
|
||||||
|
name = prop.Name
|
||||||
|
if prop.is_a("IfcPropertySingleValue"):
|
||||||
|
val = prop.NominalValue
|
||||||
|
if val is not None:
|
||||||
|
result[name] = val.wrappedValue if hasattr(val, "wrappedValue") else val
|
||||||
|
elif prop.is_a("IfcPropertyListValue"):
|
||||||
|
values = getattr(prop, "ListValues", None)
|
||||||
|
if values:
|
||||||
|
result[name] = [
|
||||||
|
v.wrappedValue if hasattr(v, "wrappedValue") else v for v in values
|
||||||
|
]
|
||||||
|
elif prop.is_a("IfcPropertyEnumeratedValue"):
|
||||||
|
values = getattr(prop, "EnumerationValues", None)
|
||||||
|
if values:
|
||||||
|
result[name] = [
|
||||||
|
v.wrappedValue if hasattr(v, "wrappedValue") else v for v in values
|
||||||
|
]
|
||||||
|
|
||||||
|
# elif prop.is_a("IfcPropertyTableValue"):
|
||||||
|
# properties[name] = #not sure if we want to support these...
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
def _get_quantities(
|
||||||
|
quantities: list[entity_instance], element: entity_instance
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
"""Extract quantity values from IfcPhysicalQuantity entities."""
|
||||||
|
results: dict[str, Any] = {}
|
||||||
|
for quantity in quantities or []:
|
||||||
|
quantity_name = quantity.Name
|
||||||
|
|
||||||
|
if quantity.is_a("IfcPhysicalSimpleQuantity"):
|
||||||
|
# Get the quantity value (3rd attribute for simple quantities)
|
||||||
|
value = getattr(quantity, quantity.attribute_name(3))
|
||||||
|
unit_info = _get_unit_info(element, quantity)
|
||||||
|
|
||||||
|
if unit_info:
|
||||||
|
# Create structured quantity object with units
|
||||||
|
results[quantity_name] = {
|
||||||
|
"name": quantity_name,
|
||||||
|
"value": value,
|
||||||
|
**unit_info,
|
||||||
|
}
|
||||||
|
else:
|
||||||
|
# No unit info available, keep as simple value with name
|
||||||
|
results[quantity_name] = {"name": quantity_name, "value": value}
|
||||||
|
|
||||||
|
elif quantity.is_a("IfcPhysicalComplexQuantity"):
|
||||||
|
# Handle complex quantities
|
||||||
|
data = {
|
||||||
|
k: v
|
||||||
|
for k, v in quantity.get_info().items()
|
||||||
|
if v is not None and k != "Name"
|
||||||
|
}
|
||||||
|
data["properties"] = _get_quantities(quantity.HasQuantities, element)
|
||||||
|
del data["HasQuantities"]
|
||||||
|
results[quantity_name] = data
|
||||||
|
return results
|
||||||
|
|
||||||
|
|
||||||
|
def _get_unit_info(
|
||||||
|
element: entity_instance, quantity: entity_instance
|
||||||
|
) -> dict[str, str]:
|
||||||
|
"""Get unit information for a quantity."""
|
||||||
|
# Early return for count quantities - they don't have units
|
||||||
|
quantity_type = quantity.is_a()
|
||||||
|
if quantity_type == "IfcQuantityCount":
|
||||||
|
return {}
|
||||||
|
|
||||||
|
unit = getattr(element, "Unit", None)
|
||||||
|
if unit:
|
||||||
|
# Quantity has its own unit
|
||||||
|
unit_name = get_full_unit_name(unit)
|
||||||
|
formatted_unit_name = unit_name.replace("_", " ").title() if unit_name else ""
|
||||||
|
return {"units": formatted_unit_name}
|
||||||
|
|
||||||
|
else:
|
||||||
|
# Fall back to project unit based on quantity type
|
||||||
|
unit_type = UNIT_MAPPING.get(quantity_type)
|
||||||
|
if not unit_type:
|
||||||
|
return {}
|
||||||
|
|
||||||
|
# Get the project unit for this unit type
|
||||||
|
project_unit = get_project_unit(element.file, unit_type, use_cache=True)
|
||||||
|
if not project_unit:
|
||||||
|
return {}
|
||||||
|
|
||||||
|
# Get unit name and format
|
||||||
|
unit_name = get_full_unit_name(project_unit)
|
||||||
|
formatted_unit_name = unit_name.replace("_", " ").title() if unit_name else ""
|
||||||
|
|
||||||
|
return {"units": formatted_unit_name}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
from specklepy.objects.geometry import Mesh
|
||||||
|
from specklepy.objects.other import RenderMaterial
|
||||||
|
from specklepy.objects.proxies import RenderMaterialProxy
|
||||||
|
|
||||||
|
|
||||||
|
class RenderMaterialProxyManager:
|
||||||
|
def __init__(self):
|
||||||
|
self._render_material_proxies: dict[str, RenderMaterialProxy] = {}
|
||||||
|
|
||||||
|
@property
|
||||||
|
def render_material_proxies(self):
|
||||||
|
return self._render_material_proxies
|
||||||
|
|
||||||
|
def add_mesh_material_mapping(
|
||||||
|
self, render_material: RenderMaterial, mesh: Mesh
|
||||||
|
) -> None:
|
||||||
|
material_id = render_material.applicationId
|
||||||
|
assert material_id is not None
|
||||||
|
mesh_id = mesh.applicationId
|
||||||
|
assert mesh_id is not None
|
||||||
|
|
||||||
|
proxy = self._render_material_proxies.get(material_id, None)
|
||||||
|
if proxy is not None:
|
||||||
|
proxy.objects.append(mesh_id)
|
||||||
|
else:
|
||||||
|
self._render_material_proxies[material_id] = RenderMaterialProxy(
|
||||||
|
objects=[mesh_id], value=render_material
|
||||||
|
)
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
# from specklepy import objects
|
||||||
|
|
||||||
|
# __all__ = ["objects"]
|
||||||
@@ -0,0 +1,161 @@
|
|||||||
|
import contextlib
|
||||||
|
|
||||||
|
from specklepy.api.credentials import Account
|
||||||
|
from specklepy.api.resources import (
|
||||||
|
ActiveUserResource,
|
||||||
|
FileImportResource,
|
||||||
|
ModelResource,
|
||||||
|
OtherUserResource,
|
||||||
|
ProjectInviteResource,
|
||||||
|
ProjectResource,
|
||||||
|
ServerResource,
|
||||||
|
SubscriptionResource,
|
||||||
|
VersionResource,
|
||||||
|
WorkspaceResource,
|
||||||
|
)
|
||||||
|
from specklepy.core.api.client import SpeckleClient as CoreSpeckleClient
|
||||||
|
from specklepy.logging import metrics
|
||||||
|
|
||||||
|
|
||||||
|
class SpeckleClient(CoreSpeckleClient):
|
||||||
|
"""
|
||||||
|
The `SpeckleClient` is your entry point for interacting with
|
||||||
|
your Speckle Server's GraphQL API.
|
||||||
|
You'll need to have access to a server to use it,
|
||||||
|
or you can use our public server `app.speckle.systems`.
|
||||||
|
|
||||||
|
To authenticate the client, you'll need to have downloaded
|
||||||
|
the [Speckle Manager](https://speckle.guide/#speckle-manager)
|
||||||
|
and added your account.
|
||||||
|
|
||||||
|
```py
|
||||||
|
from specklepy.api.client import SpeckleClient
|
||||||
|
from specklepy.core.api.inputs.project_inputs import ProjectCreateInput
|
||||||
|
from specklepy.api.credentials import get_default_account
|
||||||
|
|
||||||
|
# initialise the client
|
||||||
|
client = SpeckleClient(host="app.speckle.systems") # or whatever your host is
|
||||||
|
# client = SpeckleClient(host="localhost:3000", use_ssl=False) or use local server
|
||||||
|
|
||||||
|
# authenticate the client with an account
|
||||||
|
# (account has been added in Speckle Manager)
|
||||||
|
account = get_default_account()
|
||||||
|
client.authenticate_with_account(account)
|
||||||
|
|
||||||
|
# create a new project
|
||||||
|
input = ProjectCreateInput(name="a shiny new project")
|
||||||
|
project = self.project.create(input)
|
||||||
|
|
||||||
|
# or, use a project id to get an existing project from the server
|
||||||
|
new_stream = client.project.get("abcdefghij")
|
||||||
|
```
|
||||||
|
"""
|
||||||
|
|
||||||
|
DEFAULT_HOST = "app.speckle.systems"
|
||||||
|
USE_SSL = True
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
host: str = DEFAULT_HOST,
|
||||||
|
use_ssl: bool = USE_SSL,
|
||||||
|
verify_certificate: bool = True,
|
||||||
|
) -> None:
|
||||||
|
super().__init__(
|
||||||
|
host=host,
|
||||||
|
use_ssl=use_ssl,
|
||||||
|
verify_certificate=verify_certificate,
|
||||||
|
)
|
||||||
|
self.account = Account()
|
||||||
|
|
||||||
|
def _init_resources(self) -> None:
|
||||||
|
self.server = ServerResource(
|
||||||
|
account=self.account, basepath=self.url, client=self.httpclient
|
||||||
|
)
|
||||||
|
|
||||||
|
server_version = None
|
||||||
|
|
||||||
|
with contextlib.suppress(Exception):
|
||||||
|
server_version = self.server.version()
|
||||||
|
|
||||||
|
self.other_user = OtherUserResource(
|
||||||
|
account=self.account,
|
||||||
|
basepath=self.url,
|
||||||
|
client=self.httpclient,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
self.active_user = ActiveUserResource(
|
||||||
|
account=self.account,
|
||||||
|
basepath=self.url,
|
||||||
|
client=self.httpclient,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
self.project = ProjectResource(
|
||||||
|
account=self.account,
|
||||||
|
basepath=self.url,
|
||||||
|
client=self.httpclient,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
self.project_invite = ProjectInviteResource(
|
||||||
|
account=self.account,
|
||||||
|
basepath=self.url,
|
||||||
|
client=self.httpclient,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
self.model = ModelResource(
|
||||||
|
account=self.account,
|
||||||
|
basepath=self.url,
|
||||||
|
client=self.httpclient,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
self.version = VersionResource(
|
||||||
|
account=self.account,
|
||||||
|
basepath=self.url,
|
||||||
|
client=self.httpclient,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
self.workspace = WorkspaceResource(
|
||||||
|
account=self.account,
|
||||||
|
basepath=self.url,
|
||||||
|
client=self.httpclient,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
self.file_import = FileImportResource(
|
||||||
|
account=self.account,
|
||||||
|
basepath=self.url,
|
||||||
|
client=self.httpclient,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
self.subscription = SubscriptionResource(
|
||||||
|
account=self.account,
|
||||||
|
basepath=self.ws_url,
|
||||||
|
client=self.wsclient,
|
||||||
|
# todo: why doesn't this take a server version
|
||||||
|
)
|
||||||
|
|
||||||
|
def authenticate_with_token(self, token: str) -> None:
|
||||||
|
"""
|
||||||
|
Authenticate the client using a personal access token.
|
||||||
|
The token is saved in the client object and a synchronous GraphQL
|
||||||
|
entrypoint is created
|
||||||
|
|
||||||
|
Arguments:
|
||||||
|
token {str} -- an api token
|
||||||
|
"""
|
||||||
|
metrics.track(
|
||||||
|
metrics.SDK, self.account, {"name": "Client Authenticate With Token"}
|
||||||
|
)
|
||||||
|
return super().authenticate_with_token(token)
|
||||||
|
|
||||||
|
def authenticate_with_account(self, account: Account) -> None:
|
||||||
|
"""Authenticate the client using an Account object
|
||||||
|
The account is saved in the client object and a synchronous GraphQL
|
||||||
|
entrypoint is created
|
||||||
|
|
||||||
|
Arguments:
|
||||||
|
account {Account} -- the account object which can be found with
|
||||||
|
`get_default_account` or `get_local_accounts`
|
||||||
|
"""
|
||||||
|
metrics.track(
|
||||||
|
metrics.SDK, self.account, {"name": "Client Authenticate With Account"}
|
||||||
|
)
|
||||||
|
return super().authenticate_with_account(account)
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
# following imports seem to be unnecessary, but they need to stay
|
||||||
|
# to not break the scripts using these functions as non-core
|
||||||
|
from specklepy.core.api.credentials import ( # noqa: F401
|
||||||
|
Account,
|
||||||
|
StreamWrapper, # noqa: F401
|
||||||
|
UserInfo,
|
||||||
|
)
|
||||||
|
from specklepy.core.api.credentials import (
|
||||||
|
get_account_from_token as core_get_account_from_token,
|
||||||
|
)
|
||||||
|
from specklepy.core.api.credentials import get_local_accounts as core_get_local_accounts
|
||||||
|
from specklepy.logging import metrics
|
||||||
|
|
||||||
|
|
||||||
|
def get_local_accounts(base_path: str | None = None) -> list[Account]:
|
||||||
|
"""Gets all the accounts present in this environment
|
||||||
|
|
||||||
|
Arguments:
|
||||||
|
base_path {str} -- custom base path if you are not using the system default
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
List[Account] -- list of all local accounts or an empty list if
|
||||||
|
no accounts were found
|
||||||
|
"""
|
||||||
|
accounts = core_get_local_accounts(base_path)
|
||||||
|
|
||||||
|
metrics.track(
|
||||||
|
metrics.SDK,
|
||||||
|
next(
|
||||||
|
(acc for acc in accounts if acc.isDefault),
|
||||||
|
accounts[0] if accounts else None,
|
||||||
|
),
|
||||||
|
{"name": "Get Local Accounts"},
|
||||||
|
)
|
||||||
|
|
||||||
|
return accounts
|
||||||
|
|
||||||
|
|
||||||
|
def get_default_account(base_path: str | None = None) -> Account | None:
|
||||||
|
"""
|
||||||
|
Gets this environment's default account if any. If there is no default,
|
||||||
|
the first found will be returned and set as default.
|
||||||
|
Arguments:
|
||||||
|
base_path {str} -- custom base path if you are not using the system default
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Account -- the default account or None if no local accounts were found
|
||||||
|
"""
|
||||||
|
accounts = core_get_local_accounts(base_path=base_path)
|
||||||
|
if not accounts:
|
||||||
|
return None
|
||||||
|
|
||||||
|
default = next((acc for acc in accounts if acc.isDefault), None)
|
||||||
|
if not default:
|
||||||
|
default = accounts[0]
|
||||||
|
default.isDefault = True
|
||||||
|
metrics.initialise_tracker(default)
|
||||||
|
|
||||||
|
return default
|
||||||
|
|
||||||
|
|
||||||
|
def get_account_from_token(token: str, server_url: str | None = None) -> Account:
|
||||||
|
"""Gets the local account for the token if it exists
|
||||||
|
Arguments:
|
||||||
|
token {str} -- the api token
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Account -- the local account with this token or a shell account containing
|
||||||
|
just the token and url if no local account is found
|
||||||
|
"""
|
||||||
|
account = core_get_account_from_token(token, server_url)
|
||||||
|
|
||||||
|
metrics.track(metrics.SDK, account, {"name": "Get Account From Token"})
|
||||||
|
return account
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
from specklepy.core.api.host_applications import (
|
||||||
|
ARCGIS,
|
||||||
|
ARCHICAD,
|
||||||
|
AUTOCAD,
|
||||||
|
BLENDER,
|
||||||
|
CIVIL,
|
||||||
|
CSIBRIDGE,
|
||||||
|
DXF,
|
||||||
|
DYNAMO,
|
||||||
|
ETABS,
|
||||||
|
EXCEL,
|
||||||
|
GRASSHOPPER,
|
||||||
|
GSA,
|
||||||
|
MICROSTATION,
|
||||||
|
NET,
|
||||||
|
OPENBUILDINGS,
|
||||||
|
OPENRAIL,
|
||||||
|
OPENROADS,
|
||||||
|
OTHER,
|
||||||
|
POWERBI,
|
||||||
|
PYTHON,
|
||||||
|
QGIS,
|
||||||
|
REVIT,
|
||||||
|
RHINO,
|
||||||
|
SAFE,
|
||||||
|
SAP2000,
|
||||||
|
SKETCHUP,
|
||||||
|
TEKLASTRUCTURES,
|
||||||
|
TOPSOLID,
|
||||||
|
UNITY,
|
||||||
|
UNREAL,
|
||||||
|
HostApplication,
|
||||||
|
HostAppVersion,
|
||||||
|
_app_name_host_app_mapping,
|
||||||
|
get_host_app_from_string,
|
||||||
|
)
|
||||||
|
|
||||||
|
# re-exporting stuff from the moved api module
|
||||||
|
__all__ = [
|
||||||
|
"ARCGIS",
|
||||||
|
"ARCHICAD",
|
||||||
|
"AUTOCAD",
|
||||||
|
"BLENDER",
|
||||||
|
"CIVIL",
|
||||||
|
"CSIBRIDGE",
|
||||||
|
"DXF",
|
||||||
|
"DYNAMO",
|
||||||
|
"ETABS",
|
||||||
|
"EXCEL",
|
||||||
|
"GRASSHOPPER",
|
||||||
|
"GSA",
|
||||||
|
"MICROSTATION",
|
||||||
|
"NET",
|
||||||
|
"OPENBUILDINGS",
|
||||||
|
"OPENRAIL",
|
||||||
|
"OPENROADS",
|
||||||
|
"OTHER",
|
||||||
|
"POWERBI",
|
||||||
|
"PYTHON",
|
||||||
|
"QGIS",
|
||||||
|
"REVIT",
|
||||||
|
"RHINO",
|
||||||
|
"SAFE",
|
||||||
|
"SAP2000",
|
||||||
|
"SKETCHUP",
|
||||||
|
"TEKLASTRUCTURES",
|
||||||
|
"TOPSOLID",
|
||||||
|
"UNITY",
|
||||||
|
"UNREAL",
|
||||||
|
"HostApplication",
|
||||||
|
"HostAppVersion",
|
||||||
|
"_app_name_host_app_mapping",
|
||||||
|
"get_host_app_from_string",
|
||||||
|
]
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
# following imports seem to be unnecessary, but they need to stay
|
||||||
|
# to not break the scripts using these functions as non-core
|
||||||
|
from specklepy.core.api.models import (
|
||||||
|
LimitedUser,
|
||||||
|
PendingStreamCollaborator,
|
||||||
|
ServerInfo,
|
||||||
|
User,
|
||||||
|
)
|
||||||
|
|
||||||
|
__all__ = [
|
||||||
|
"LimitedUser",
|
||||||
|
"PendingStreamCollaborator",
|
||||||
|
"ServerInfo",
|
||||||
|
"User",
|
||||||
|
]
|
||||||
@@ -0,0 +1,101 @@
|
|||||||
|
from typing import List, Optional
|
||||||
|
|
||||||
|
from specklepy.core.api.operations import deserialize as core_deserialize
|
||||||
|
from specklepy.core.api.operations import receive as _untracked_receive
|
||||||
|
from specklepy.core.api.operations import send as core_send
|
||||||
|
from specklepy.core.api.operations import serialize as core_serialize
|
||||||
|
from specklepy.logging import metrics
|
||||||
|
from specklepy.objects.base import Base
|
||||||
|
from specklepy.transports.abstract_transport import AbstractTransport
|
||||||
|
|
||||||
|
|
||||||
|
def send(
|
||||||
|
base: Base,
|
||||||
|
transports: Optional[List[AbstractTransport]] = None,
|
||||||
|
use_default_cache: bool = True,
|
||||||
|
):
|
||||||
|
"""Sends an object via the provided transports. Defaults to the local cache.
|
||||||
|
|
||||||
|
Arguments:
|
||||||
|
obj {Base} -- the object you want to send
|
||||||
|
transports {list} -- where you want to send them
|
||||||
|
use_default_cache {bool} -- toggle for the default cache.
|
||||||
|
If set to false, it will only send to the provided transports
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
str -- the object id of the sent object
|
||||||
|
"""
|
||||||
|
if transports is None:
|
||||||
|
metrics.track(metrics.SEND)
|
||||||
|
else:
|
||||||
|
metrics.track(metrics.SEND, getattr(transports[0], "account", None))
|
||||||
|
|
||||||
|
return core_send(base, transports, use_default_cache)
|
||||||
|
|
||||||
|
|
||||||
|
def receive(
|
||||||
|
obj_id: str,
|
||||||
|
remote_transport: Optional[AbstractTransport] = None,
|
||||||
|
local_transport: Optional[AbstractTransport] = None,
|
||||||
|
) -> Base:
|
||||||
|
"""Receives an object from a transport.
|
||||||
|
|
||||||
|
Arguments:
|
||||||
|
obj_id {str} -- the id of the object to receive
|
||||||
|
remote_transport {Transport} -- the transport to receive from
|
||||||
|
local_transport {Transport} -- the local cache to check for existing objects
|
||||||
|
(defaults to `SQLiteTransport`)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Base -- the base object
|
||||||
|
"""
|
||||||
|
metrics.track(metrics.RECEIVE, getattr(remote_transport, "account", None))
|
||||||
|
return _untracked_receive(obj_id, remote_transport, local_transport)
|
||||||
|
|
||||||
|
|
||||||
|
def serialize(
|
||||||
|
base: Base, write_transports: List[AbstractTransport] | None = None
|
||||||
|
) -> str:
|
||||||
|
"""
|
||||||
|
Serialize a base object. If no write transports are provided,
|
||||||
|
the object will be serialized
|
||||||
|
without detaching or chunking any of the attributes.
|
||||||
|
|
||||||
|
Arguments:
|
||||||
|
base {Base} -- the object to serialize
|
||||||
|
write_transports {List[AbstractTransport]}
|
||||||
|
-- optional: the transports to write to
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
str -- the serialized object
|
||||||
|
"""
|
||||||
|
if not write_transports:
|
||||||
|
write_transports = []
|
||||||
|
metrics.track(metrics.SDK, custom_props={"name": "Serialize"})
|
||||||
|
return core_serialize(base, write_transports)
|
||||||
|
|
||||||
|
|
||||||
|
def deserialize(
|
||||||
|
obj_string: str, read_transport: Optional[AbstractTransport] = None
|
||||||
|
) -> Base:
|
||||||
|
"""
|
||||||
|
Deserialize a string object into a Base object.
|
||||||
|
|
||||||
|
If the object contains referenced child objects that are not stored in the local db,
|
||||||
|
a read transport needs to be provided in order to recompose
|
||||||
|
the base with the children objects.
|
||||||
|
|
||||||
|
Arguments:
|
||||||
|
obj_string {str} -- the string object to deserialize
|
||||||
|
read_transport {AbstractTransport}
|
||||||
|
-- the transport to fetch children objects from
|
||||||
|
(defaults to SQLiteTransport)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Base -- the deserialized object
|
||||||
|
"""
|
||||||
|
metrics.track(metrics.SDK, custom_props={"name": "Deserialize"})
|
||||||
|
return core_deserialize(obj_string, read_transport)
|
||||||
|
|
||||||
|
|
||||||
|
__all__ = ["receive", "send", "serialize", "deserialize"]
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
from typing import Any, Optional, Tuple
|
||||||
|
|
||||||
|
from gql.client import Client
|
||||||
|
|
||||||
|
from specklepy.api.credentials import Account
|
||||||
|
from specklepy.core.api.resource import ResourceBase as CoreResourceBase
|
||||||
|
|
||||||
|
|
||||||
|
class ResourceBase(CoreResourceBase):
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
account: Account,
|
||||||
|
basepath: str,
|
||||||
|
client: Client,
|
||||||
|
name: str,
|
||||||
|
server_version: Optional[Tuple[Any, ...]] = None,
|
||||||
|
) -> None:
|
||||||
|
super().__init__(
|
||||||
|
account=account,
|
||||||
|
basepath=basepath,
|
||||||
|
client=client,
|
||||||
|
name=name,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
from specklepy.api.resources.current.active_user_resource import ActiveUserResource
|
||||||
|
from specklepy.api.resources.current.file_import_resource import FileImportResource
|
||||||
|
from specklepy.api.resources.current.model_resource import ModelResource
|
||||||
|
from specklepy.api.resources.current.other_user_resource import OtherUserResource
|
||||||
|
from specklepy.api.resources.current.project_invite_resource import (
|
||||||
|
ProjectInviteResource,
|
||||||
|
)
|
||||||
|
from specklepy.api.resources.current.project_resource import ProjectResource
|
||||||
|
from specklepy.api.resources.current.server_resource import ServerResource
|
||||||
|
from specklepy.api.resources.current.subscription_resource import SubscriptionResource
|
||||||
|
from specklepy.api.resources.current.version_resource import VersionResource
|
||||||
|
from specklepy.api.resources.current.workspace_resource import WorkspaceResource
|
||||||
|
|
||||||
|
__all__ = [
|
||||||
|
"FileImportResource",
|
||||||
|
"ActiveUserResource",
|
||||||
|
"ModelResource",
|
||||||
|
"OtherUserResource",
|
||||||
|
"ProjectInviteResource",
|
||||||
|
"ProjectResource",
|
||||||
|
"ServerResource",
|
||||||
|
"SubscriptionResource",
|
||||||
|
"VersionResource",
|
||||||
|
"WorkspaceResource",
|
||||||
|
]
|
||||||
@@ -0,0 +1,102 @@
|
|||||||
|
from typing import List, Optional
|
||||||
|
|
||||||
|
from specklepy.core.api.inputs.user_inputs import (
|
||||||
|
UserProjectsFilter,
|
||||||
|
UserUpdateInput,
|
||||||
|
UserWorkspacesFilter,
|
||||||
|
)
|
||||||
|
from specklepy.core.api.models import (
|
||||||
|
PendingStreamCollaborator,
|
||||||
|
Project,
|
||||||
|
ResourceCollection,
|
||||||
|
User,
|
||||||
|
)
|
||||||
|
from specklepy.core.api.models.current import (
|
||||||
|
LimitedWorkspace,
|
||||||
|
PermissionCheckResult,
|
||||||
|
ProjectWithPermissions,
|
||||||
|
Workspace,
|
||||||
|
)
|
||||||
|
from specklepy.core.api.resources import ActiveUserResource as CoreResource
|
||||||
|
from specklepy.logging import metrics
|
||||||
|
|
||||||
|
|
||||||
|
class ActiveUserResource(CoreResource):
|
||||||
|
"""API Access class for users. This class provides methods to get and update
|
||||||
|
the user profile, fetch user activity, and manage pending stream invitations."""
|
||||||
|
|
||||||
|
def __init__(self, account, basepath, client, server_version) -> None:
|
||||||
|
super().__init__(
|
||||||
|
account=account,
|
||||||
|
basepath=basepath,
|
||||||
|
client=client,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
self.schema = User
|
||||||
|
|
||||||
|
def get(self) -> Optional[User]:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Active User Get"})
|
||||||
|
return super().get()
|
||||||
|
|
||||||
|
def update(
|
||||||
|
self,
|
||||||
|
input: UserUpdateInput,
|
||||||
|
) -> User:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Active User Update"})
|
||||||
|
|
||||||
|
return super().update(input=input)
|
||||||
|
|
||||||
|
def get_projects(
|
||||||
|
self,
|
||||||
|
*,
|
||||||
|
limit: int = 25,
|
||||||
|
cursor: Optional[str] = None,
|
||||||
|
filter: Optional[UserProjectsFilter] = None,
|
||||||
|
) -> ResourceCollection[Project]:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Active User Get Projects"})
|
||||||
|
return super().get_projects(limit=limit, cursor=cursor, filter=filter)
|
||||||
|
|
||||||
|
def get_projects_with_permissions(
|
||||||
|
self,
|
||||||
|
*,
|
||||||
|
limit: int = 25,
|
||||||
|
cursor: Optional[str] = None,
|
||||||
|
filter: Optional[UserProjectsFilter] = None,
|
||||||
|
) -> ResourceCollection[ProjectWithPermissions]:
|
||||||
|
metrics.track(
|
||||||
|
metrics.SDK,
|
||||||
|
self.account,
|
||||||
|
{"name": "Active User Get Projects With Permissions"},
|
||||||
|
)
|
||||||
|
return super().get_projects_with_permissions(
|
||||||
|
limit=limit, cursor=cursor, filter=filter
|
||||||
|
)
|
||||||
|
|
||||||
|
def get_project_invites(self) -> List[PendingStreamCollaborator]:
|
||||||
|
metrics.track(
|
||||||
|
metrics.SDK, self.account, {"name": "Active User Get Project Invites"}
|
||||||
|
)
|
||||||
|
return super().get_project_invites()
|
||||||
|
|
||||||
|
def can_create_personal_projects(self) -> PermissionCheckResult:
|
||||||
|
metrics.track(
|
||||||
|
metrics.SDK,
|
||||||
|
self.account,
|
||||||
|
{"name": "Active User Can Create Personal Projects Check"},
|
||||||
|
)
|
||||||
|
return super().can_create_personal_projects()
|
||||||
|
|
||||||
|
def get_workspaces(
|
||||||
|
self,
|
||||||
|
limit: int = 25,
|
||||||
|
cursor: Optional[str] = None,
|
||||||
|
filter: Optional[UserWorkspacesFilter] = None,
|
||||||
|
) -> ResourceCollection[Workspace]:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Active User Get Workspaces"})
|
||||||
|
return super().get_workspaces(limit, cursor, filter)
|
||||||
|
|
||||||
|
def get_active_workspace(self) -> Optional[LimitedWorkspace]:
|
||||||
|
metrics.track(
|
||||||
|
metrics.SDK, self.account, {"name": "Active User Get Active Workspace"}
|
||||||
|
)
|
||||||
|
return super().get_active_workspace()
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
from typing_extensions import override
|
||||||
|
|
||||||
|
from specklepy.core.api.inputs import (
|
||||||
|
FinishFileImportInput,
|
||||||
|
GenerateFileUploadUrlInput,
|
||||||
|
StartFileImportInput,
|
||||||
|
)
|
||||||
|
from specklepy.core.api.models import FileImport, FileUploadUrl
|
||||||
|
from specklepy.core.api.models.current import ResourceCollection
|
||||||
|
from specklepy.core.api.resources import FileImportResource as CoreResource
|
||||||
|
from specklepy.core.api.resources.current.file_import_resource import UploadFileResponse
|
||||||
|
from specklepy.logging import metrics
|
||||||
|
|
||||||
|
|
||||||
|
class FileImportResource(CoreResource):
|
||||||
|
"""API Access class for projects"""
|
||||||
|
|
||||||
|
def __init__(self, account, basepath, client, server_version) -> None:
|
||||||
|
super().__init__(
|
||||||
|
account=account,
|
||||||
|
basepath=basepath,
|
||||||
|
client=client,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
|
||||||
|
@override
|
||||||
|
def start_file_import(self, input: StartFileImportInput) -> FileImport:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "File Import Start"})
|
||||||
|
return super().start_file_import(input)
|
||||||
|
|
||||||
|
@override
|
||||||
|
def generate_upload_url(self, input: GenerateFileUploadUrlInput) -> FileUploadUrl:
|
||||||
|
"""
|
||||||
|
Get a file upload url from the Speckle server.
|
||||||
|
|
||||||
|
This method asks the server to create a pre-signed S3 url,
|
||||||
|
which can be used as a short term authenticated route,
|
||||||
|
to put a file to the server.
|
||||||
|
"""
|
||||||
|
metrics.track(
|
||||||
|
metrics.SDK, self.account, {"name": "File Import Generate Upload Url"}
|
||||||
|
)
|
||||||
|
return super().generate_upload_url(input)
|
||||||
|
|
||||||
|
@override
|
||||||
|
def upload_file(self, file: Path, url: str) -> UploadFileResponse:
|
||||||
|
"""
|
||||||
|
Uploads a file to the given S3 url.
|
||||||
|
|
||||||
|
This method should be used together with the generate_upload_url method,
|
||||||
|
which generates a pre-signed S3 url, that can be used to upload the file to.
|
||||||
|
"""
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "File Import Upload File"})
|
||||||
|
return super().upload_file(file, url)
|
||||||
|
|
||||||
|
@override
|
||||||
|
def download_file(self, project_id: str, file_id: str, target_file: Path) -> Path:
|
||||||
|
"""Download a file blob attached to the project, to the target path."""
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "File Import Download File"})
|
||||||
|
return super().download_file(project_id, file_id, target_file)
|
||||||
|
|
||||||
|
@override
|
||||||
|
def finish_file_import_job(self, input: FinishFileImportInput) -> bool:
|
||||||
|
"""
|
||||||
|
This is mostly an internal api, that marks a file import job finished.
|
||||||
|
|
||||||
|
Only use this if you are writing a file importer, that is responsible for
|
||||||
|
processing file import jobs.
|
||||||
|
"""
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "File Import Finish Job"})
|
||||||
|
return super().finish_file_import_job(input)
|
||||||
|
|
||||||
|
@override
|
||||||
|
def get_model_file_import_jobs(
|
||||||
|
self,
|
||||||
|
*,
|
||||||
|
project_id: str,
|
||||||
|
model_id: str,
|
||||||
|
limit: int = 25,
|
||||||
|
cursor: str | None = None,
|
||||||
|
) -> ResourceCollection[FileImport]:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "File Import Get Model Jobs"})
|
||||||
|
return super().get_model_file_import_jobs(
|
||||||
|
project_id=project_id, model_id=model_id, limit=limit, cursor=cursor
|
||||||
|
)
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
from specklepy.core.api.inputs.model_inputs import (
|
||||||
|
CreateModelInput,
|
||||||
|
DeleteModelInput,
|
||||||
|
ModelVersionsFilter,
|
||||||
|
UpdateModelInput,
|
||||||
|
)
|
||||||
|
from specklepy.core.api.inputs.project_inputs import ProjectModelsFilter
|
||||||
|
from specklepy.core.api.models import Model, ModelWithVersions, ResourceCollection
|
||||||
|
from specklepy.core.api.resources import ModelResource as CoreResource
|
||||||
|
from specklepy.logging import metrics
|
||||||
|
|
||||||
|
|
||||||
|
class ModelResource(CoreResource):
|
||||||
|
"""API Access class for models"""
|
||||||
|
|
||||||
|
def __init__(self, account, basepath, client, server_version) -> None:
|
||||||
|
super().__init__(
|
||||||
|
account=account,
|
||||||
|
basepath=basepath,
|
||||||
|
client=client,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
|
||||||
|
def get(self, model_id: str, project_id: str) -> Model:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Model Get"})
|
||||||
|
return super().get(model_id, project_id)
|
||||||
|
|
||||||
|
def get_with_versions(
|
||||||
|
self,
|
||||||
|
model_id: str,
|
||||||
|
project_id: str,
|
||||||
|
*,
|
||||||
|
versions_limit: int = 25,
|
||||||
|
versions_cursor: Optional[str] = None,
|
||||||
|
versions_filter: Optional[ModelVersionsFilter] = None,
|
||||||
|
) -> ModelWithVersions:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Model Get With Versions"})
|
||||||
|
return super().get_with_versions(
|
||||||
|
model_id,
|
||||||
|
project_id,
|
||||||
|
versions_limit=versions_limit,
|
||||||
|
versions_cursor=versions_cursor,
|
||||||
|
versions_filter=versions_filter,
|
||||||
|
)
|
||||||
|
|
||||||
|
def get_models(
|
||||||
|
self,
|
||||||
|
project_id: str,
|
||||||
|
*,
|
||||||
|
models_limit: int = 25,
|
||||||
|
models_cursor: Optional[str] = None,
|
||||||
|
models_filter: Optional[ProjectModelsFilter] = None,
|
||||||
|
) -> ResourceCollection[Model]:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Model Get Models"})
|
||||||
|
return super().get_models(
|
||||||
|
project_id,
|
||||||
|
models_limit=models_limit,
|
||||||
|
models_cursor=models_cursor,
|
||||||
|
models_filter=models_filter,
|
||||||
|
)
|
||||||
|
|
||||||
|
def create(self, input: CreateModelInput) -> Model:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Model Create"})
|
||||||
|
return super().create(input)
|
||||||
|
|
||||||
|
def delete(self, input: DeleteModelInput) -> bool:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Model Delete"})
|
||||||
|
return super().delete(input)
|
||||||
|
|
||||||
|
def update(self, input: UpdateModelInput) -> Model:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Model Update"})
|
||||||
|
return super().update(input)
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
from specklepy.core.api.models import (
|
||||||
|
LimitedUser,
|
||||||
|
UserSearchResultCollection,
|
||||||
|
)
|
||||||
|
from specklepy.core.api.resources import OtherUserResource as CoreResource
|
||||||
|
from specklepy.logging import metrics
|
||||||
|
|
||||||
|
|
||||||
|
class OtherUserResource(CoreResource):
|
||||||
|
"""
|
||||||
|
Provides API access to other users' profiles and activities on the platform.
|
||||||
|
This class enables fetching limited information about users,
|
||||||
|
searching for users by name or email,
|
||||||
|
and accessing user activity logs with appropriate privacy
|
||||||
|
and access control measures in place.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, account, basepath, client, server_version) -> None:
|
||||||
|
super().__init__(
|
||||||
|
account=account,
|
||||||
|
basepath=basepath,
|
||||||
|
client=client,
|
||||||
|
server_version=(server_version,),
|
||||||
|
)
|
||||||
|
self.schema = LimitedUser
|
||||||
|
|
||||||
|
def get(self, id: str) -> Optional[LimitedUser]:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Other User Get"})
|
||||||
|
return super().get(id)
|
||||||
|
|
||||||
|
def user_search(
|
||||||
|
self,
|
||||||
|
query: str,
|
||||||
|
*,
|
||||||
|
limit: int = 25,
|
||||||
|
cursor: Optional[str] = None,
|
||||||
|
archived: bool = False,
|
||||||
|
emailOnly: bool = False,
|
||||||
|
) -> UserSearchResultCollection:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Other User Search"})
|
||||||
|
return super().user_search(
|
||||||
|
query, limit=limit, cursor=cursor, archived=archived, emailOnly=emailOnly
|
||||||
|
)
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
from typing import Any, Optional, Tuple
|
||||||
|
|
||||||
|
from gql import Client
|
||||||
|
|
||||||
|
from specklepy.core.api.credentials import Account
|
||||||
|
from specklepy.core.api.inputs.project_inputs import (
|
||||||
|
ProjectInviteCreateInput,
|
||||||
|
ProjectInviteUseInput,
|
||||||
|
)
|
||||||
|
from specklepy.core.api.models import PendingStreamCollaborator, ProjectWithTeam
|
||||||
|
from specklepy.core.api.resources import ProjectInviteResource as CoreResource
|
||||||
|
from specklepy.logging import metrics
|
||||||
|
|
||||||
|
|
||||||
|
class ProjectInviteResource(CoreResource):
|
||||||
|
"""API Access class for project invites"""
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
account: Account,
|
||||||
|
basepath: str,
|
||||||
|
client: Client,
|
||||||
|
server_version: Optional[Tuple[Any, ...]],
|
||||||
|
) -> None:
|
||||||
|
super().__init__(
|
||||||
|
account=account,
|
||||||
|
basepath=basepath,
|
||||||
|
client=client,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
|
||||||
|
def create(
|
||||||
|
self, project_id: str, input: ProjectInviteCreateInput
|
||||||
|
) -> ProjectWithTeam:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Project Invite Create"})
|
||||||
|
return super().create(project_id, input)
|
||||||
|
|
||||||
|
def use(self, input: ProjectInviteUseInput) -> bool:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Project Invite Use"})
|
||||||
|
return super().use(input)
|
||||||
|
|
||||||
|
def get(
|
||||||
|
self, project_id: str, token: Optional[str]
|
||||||
|
) -> Optional[PendingStreamCollaborator]:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Project Invite Get"})
|
||||||
|
return super().get(project_id, token)
|
||||||
|
|
||||||
|
def cancel(
|
||||||
|
self,
|
||||||
|
project_id: str,
|
||||||
|
invite_id: str,
|
||||||
|
) -> ProjectWithTeam:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Project Invite Cancel"})
|
||||||
|
return super().cancel(project_id, invite_id)
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
from specklepy.core.api.inputs.project_inputs import (
|
||||||
|
ProjectCreateInput,
|
||||||
|
ProjectModelsFilter,
|
||||||
|
ProjectUpdateInput,
|
||||||
|
ProjectUpdateRoleInput,
|
||||||
|
WorkspaceProjectCreateInput,
|
||||||
|
)
|
||||||
|
from specklepy.core.api.models import (
|
||||||
|
Project,
|
||||||
|
ProjectWithModels,
|
||||||
|
ProjectWithTeam,
|
||||||
|
)
|
||||||
|
from specklepy.core.api.models.current import ProjectPermissionChecks
|
||||||
|
from specklepy.core.api.resources import ProjectResource as CoreResource
|
||||||
|
from specklepy.logging import metrics
|
||||||
|
|
||||||
|
|
||||||
|
class ProjectResource(CoreResource):
|
||||||
|
"""API Access class for projects"""
|
||||||
|
|
||||||
|
def __init__(self, account, basepath, client, server_version) -> None:
|
||||||
|
super().__init__(
|
||||||
|
account=account,
|
||||||
|
basepath=basepath,
|
||||||
|
client=client,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
|
||||||
|
def get(self, project_id: str) -> Project:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Project Get "})
|
||||||
|
return super().get(project_id)
|
||||||
|
|
||||||
|
def get_permissions(self, project_id: str) -> ProjectPermissionChecks:
|
||||||
|
metrics.track(
|
||||||
|
metrics.SDK, self.account, {"name": "Project Project Permissions "}
|
||||||
|
)
|
||||||
|
return super().get_permissions(project_id)
|
||||||
|
|
||||||
|
def get_with_models(
|
||||||
|
self,
|
||||||
|
project_id: str,
|
||||||
|
*,
|
||||||
|
models_limit: int = 25,
|
||||||
|
models_cursor: Optional[str] = None,
|
||||||
|
models_filter: Optional[ProjectModelsFilter] = None,
|
||||||
|
) -> ProjectWithModels:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Project Get With Models"})
|
||||||
|
return super().get_with_models(
|
||||||
|
project_id,
|
||||||
|
models_limit=models_limit,
|
||||||
|
models_cursor=models_cursor,
|
||||||
|
models_filter=models_filter,
|
||||||
|
)
|
||||||
|
|
||||||
|
def get_with_team(self, project_id: str) -> ProjectWithTeam:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Project Get With Team"})
|
||||||
|
return super().get_with_team(project_id)
|
||||||
|
|
||||||
|
def create(self, input: ProjectCreateInput) -> Project:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Project Create"})
|
||||||
|
return super().create(input)
|
||||||
|
|
||||||
|
def create_in_workspace(self, input: WorkspaceProjectCreateInput) -> Project:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Workspace Project Create"})
|
||||||
|
return super().create_in_workspace(input)
|
||||||
|
|
||||||
|
def update(self, input: ProjectUpdateInput) -> Project:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Project Update"})
|
||||||
|
return super().update(input)
|
||||||
|
|
||||||
|
def delete(self, project_id: str) -> bool:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Project Delete"})
|
||||||
|
return super().delete(project_id)
|
||||||
|
|
||||||
|
def update_role(self, input: ProjectUpdateRoleInput) -> ProjectWithTeam:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Project Update Role"})
|
||||||
|
return super().update_role(input)
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
from typing import Any, Dict, List, Tuple
|
||||||
|
|
||||||
|
from specklepy.api.models import ServerInfo
|
||||||
|
from specklepy.core.api.resources import ServerResource as CoreResource
|
||||||
|
from specklepy.logging import metrics
|
||||||
|
|
||||||
|
|
||||||
|
class ServerResource(CoreResource):
|
||||||
|
"""API Access class for the server"""
|
||||||
|
|
||||||
|
def __init__(self, account, basepath, client) -> None:
|
||||||
|
super().__init__(
|
||||||
|
account=account,
|
||||||
|
basepath=basepath,
|
||||||
|
client=client,
|
||||||
|
)
|
||||||
|
|
||||||
|
def get(self) -> ServerInfo:
|
||||||
|
"""Get the server info
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
dict -- the server info in dictionary form
|
||||||
|
"""
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Server Get"})
|
||||||
|
return super().get()
|
||||||
|
|
||||||
|
def version(self) -> Tuple[Any, ...]:
|
||||||
|
"""Get the server version
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
the server version in the format (major, minor, patch, (tag, build))
|
||||||
|
eg (2, 6, 3) for a stable build and (2, 6, 4, 'alpha', 4711) for alpha
|
||||||
|
"""
|
||||||
|
# not tracking as it will be called along with other
|
||||||
|
# mutations / queries as a check
|
||||||
|
return super().version()
|
||||||
|
|
||||||
|
def apps(self) -> Dict:
|
||||||
|
"""Get the apps registered on the server
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
dict -- a dictionary of apps registered on the server
|
||||||
|
"""
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Server Apps"})
|
||||||
|
return super().apps()
|
||||||
|
|
||||||
|
def create_token(self, name: str, scopes: List[str], lifespan: int) -> str:
|
||||||
|
"""Create a personal API token
|
||||||
|
|
||||||
|
Arguments:
|
||||||
|
scopes {List[str]} -- the scopes to grant with this token
|
||||||
|
name {str} -- a name for your new token
|
||||||
|
lifespan {int} -- duration before the token expires
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
str -- the new API token. note: this is the only time you'll see the token!
|
||||||
|
"""
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Server Create Token"})
|
||||||
|
return super().create_token(name, scopes, lifespan)
|
||||||
|
|
||||||
|
def revoke_token(self, token: str) -> bool:
|
||||||
|
"""Revokes (deletes) a personal API token
|
||||||
|
|
||||||
|
Arguments:
|
||||||
|
token {str} -- the token to revoke (delete)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
bool -- True if the token was successfully deleted
|
||||||
|
"""
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Server Revoke Token"})
|
||||||
|
return super().revoke_token(token)
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
from typing import Callable, Optional, Sequence
|
||||||
|
|
||||||
|
from pydantic import BaseModel
|
||||||
|
from typing_extensions import TypeVar
|
||||||
|
|
||||||
|
from specklepy.core.api.models import (
|
||||||
|
ProjectModelsUpdatedMessage,
|
||||||
|
ProjectUpdatedMessage,
|
||||||
|
ProjectVersionsUpdatedMessage,
|
||||||
|
UserProjectsUpdatedMessage,
|
||||||
|
)
|
||||||
|
from specklepy.core.api.resources import SubscriptionResource as CoreResource
|
||||||
|
from specklepy.logging import metrics
|
||||||
|
|
||||||
|
TEventArgs = TypeVar("TEventArgs", bound=BaseModel)
|
||||||
|
|
||||||
|
|
||||||
|
class SubscriptionResource(CoreResource):
|
||||||
|
def __init__(self, account, basepath, client) -> None:
|
||||||
|
super().__init__(
|
||||||
|
account=account,
|
||||||
|
basepath=basepath,
|
||||||
|
client=client,
|
||||||
|
)
|
||||||
|
|
||||||
|
async def user_projects_updated(
|
||||||
|
self, callback: Callable[[UserProjectsUpdatedMessage], None]
|
||||||
|
) -> None:
|
||||||
|
metrics.track(
|
||||||
|
metrics.SDK, self.account, {"name": "Subscription Project Models Updated"}
|
||||||
|
)
|
||||||
|
return await super().user_projects_updated(callback)
|
||||||
|
|
||||||
|
async def project_models_updated(
|
||||||
|
self,
|
||||||
|
callback: Callable[[ProjectModelsUpdatedMessage], None],
|
||||||
|
id: str,
|
||||||
|
*,
|
||||||
|
model_ids: Optional[Sequence[str]] = None,
|
||||||
|
) -> None:
|
||||||
|
metrics.track(
|
||||||
|
metrics.SDK, self.account, {"name": "Subscription Project Models Updated"}
|
||||||
|
)
|
||||||
|
return await super().project_models_updated(callback, id, model_ids=model_ids)
|
||||||
|
|
||||||
|
async def project_updated(
|
||||||
|
self,
|
||||||
|
callback: Callable[[ProjectUpdatedMessage], None],
|
||||||
|
id: str,
|
||||||
|
) -> None:
|
||||||
|
metrics.track(
|
||||||
|
metrics.SDK, self.account, {"name": "Subscription Project Updated"}
|
||||||
|
)
|
||||||
|
return await super().project_updated(callback, id)
|
||||||
|
|
||||||
|
async def project_versions_updated(
|
||||||
|
self,
|
||||||
|
callback: Callable[[ProjectVersionsUpdatedMessage], None],
|
||||||
|
id: str,
|
||||||
|
) -> None:
|
||||||
|
metrics.track(
|
||||||
|
metrics.SDK, self.account, {"name": "Subscription Project Versions Updated"}
|
||||||
|
)
|
||||||
|
return await super().project_versions_updated(callback, id)
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
from specklepy.core.api.inputs.model_inputs import ModelVersionsFilter
|
||||||
|
from specklepy.core.api.inputs.version_inputs import (
|
||||||
|
CreateVersionInput,
|
||||||
|
DeleteVersionsInput,
|
||||||
|
MarkReceivedVersionInput,
|
||||||
|
MoveVersionsInput,
|
||||||
|
UpdateVersionInput,
|
||||||
|
)
|
||||||
|
from specklepy.core.api.models import ResourceCollection, Version
|
||||||
|
from specklepy.core.api.resources import VersionResource as CoreResource
|
||||||
|
from specklepy.logging import metrics
|
||||||
|
|
||||||
|
|
||||||
|
class VersionResource(CoreResource):
|
||||||
|
"""API Access class for model versions"""
|
||||||
|
|
||||||
|
def __init__(self, account, basepath, client, server_version) -> None:
|
||||||
|
super().__init__(
|
||||||
|
account=account,
|
||||||
|
basepath=basepath,
|
||||||
|
client=client,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
|
||||||
|
def get(self, version_id: str, project_id: str) -> Version:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Version Get"})
|
||||||
|
return super().get(version_id, project_id)
|
||||||
|
|
||||||
|
def get_versions(
|
||||||
|
self,
|
||||||
|
model_id: str,
|
||||||
|
project_id: str,
|
||||||
|
*,
|
||||||
|
limit: int = 25,
|
||||||
|
cursor: Optional[str] = None,
|
||||||
|
filter: Optional[ModelVersionsFilter] = None,
|
||||||
|
) -> ResourceCollection[Version]:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Version Get Versions"})
|
||||||
|
return super().get_versions(
|
||||||
|
model_id, project_id, limit=limit, cursor=cursor, filter=filter
|
||||||
|
)
|
||||||
|
|
||||||
|
def create(self, input: CreateVersionInput) -> Version:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Version Create"})
|
||||||
|
return super().create(input)
|
||||||
|
|
||||||
|
def update(self, input: UpdateVersionInput) -> Version:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Version Update"})
|
||||||
|
return super().update(input)
|
||||||
|
|
||||||
|
def move_to_model(self, input: MoveVersionsInput) -> str:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Version Move To Model"})
|
||||||
|
return super().move_to_model(input)
|
||||||
|
|
||||||
|
def delete(self, input: DeleteVersionsInput) -> bool:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Version Delete"})
|
||||||
|
return super().delete(input)
|
||||||
|
|
||||||
|
def received(self, input: MarkReceivedVersionInput) -> bool:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Version Received"})
|
||||||
|
return super().received(input)
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
from typing import Optional
|
||||||
|
|
||||||
|
from specklepy.core.api.inputs.project_inputs import WorksaceProjectsFilter
|
||||||
|
from specklepy.core.api.models.current import (
|
||||||
|
Project,
|
||||||
|
ProjectWithPermissions,
|
||||||
|
ResourceCollection,
|
||||||
|
Workspace,
|
||||||
|
)
|
||||||
|
from specklepy.core.api.resources import WorkspaceResource as CoreResource
|
||||||
|
from specklepy.logging import metrics
|
||||||
|
|
||||||
|
|
||||||
|
class WorkspaceResource(CoreResource):
|
||||||
|
"""API Access class for workspace"""
|
||||||
|
|
||||||
|
def __init__(self, account, basepath, client, server_version) -> None:
|
||||||
|
super().__init__(
|
||||||
|
account=account,
|
||||||
|
basepath=basepath,
|
||||||
|
client=client,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
|
||||||
|
def get(self, workspace_id: str) -> Workspace:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Workspace Get"})
|
||||||
|
return super().get(workspace_id)
|
||||||
|
|
||||||
|
def get_projects(
|
||||||
|
self,
|
||||||
|
workspace_id: str,
|
||||||
|
limit: int = 25,
|
||||||
|
cursor: Optional[str] = None,
|
||||||
|
filter: Optional[WorksaceProjectsFilter] = None,
|
||||||
|
) -> ResourceCollection[Project]:
|
||||||
|
metrics.track(metrics.SDK, self.account, {"name": "Workspace Get Projects"})
|
||||||
|
return super().get_projects(workspace_id, limit, cursor, filter)
|
||||||
|
|
||||||
|
def get_projects_with_permissions(
|
||||||
|
self,
|
||||||
|
workspace_id: str,
|
||||||
|
limit: int = 25,
|
||||||
|
cursor: Optional[str] = None,
|
||||||
|
filter: Optional[WorksaceProjectsFilter] = None,
|
||||||
|
) -> ResourceCollection[ProjectWithPermissions]:
|
||||||
|
metrics.track(
|
||||||
|
metrics.SDK,
|
||||||
|
self.account,
|
||||||
|
{"name": "Workspace Get Projects With Permissions"},
|
||||||
|
)
|
||||||
|
return super().get_projects_with_permissions(
|
||||||
|
workspace_id, limit, cursor, filter
|
||||||
|
)
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
from specklepy.api.client import SpeckleClient
|
||||||
|
from specklepy.api.credentials import Account
|
||||||
|
from specklepy.core.api.wrapper import StreamWrapper as CoreStreamWrapper
|
||||||
|
from specklepy.logging import metrics
|
||||||
|
from specklepy.transports.server.server import ServerTransport
|
||||||
|
|
||||||
|
|
||||||
|
class StreamWrapper(CoreStreamWrapper):
|
||||||
|
"""
|
||||||
|
The `StreamWrapper` gives you some handy helpers to deal with urls and
|
||||||
|
get authenticated clients and transports.
|
||||||
|
|
||||||
|
Construct a `StreamWrapper` with a URL of a model, version, or object.
|
||||||
|
The corresponding ids will be stored
|
||||||
|
in the wrapper. If you have local accounts on the machine,
|
||||||
|
you can use the `get_account` and `get_client` methods
|
||||||
|
to get a local account for the server. You can also pass a token into `get_client`
|
||||||
|
if you don't have a corresponding
|
||||||
|
local account for the server.
|
||||||
|
|
||||||
|
```py
|
||||||
|
from specklepy.api.wrapper import StreamWrapper
|
||||||
|
|
||||||
|
# provide a url for a model, version, or object
|
||||||
|
wrapper = StreamWrapper("https://app.speckle.systems/projects/3073b96e86/models/0fe47c9dca@604bea8cc6")
|
||||||
|
|
||||||
|
# get an authenticated SpeckleClient if you have a local account for the server
|
||||||
|
client = wrapper.get_client()
|
||||||
|
|
||||||
|
# get an authenticated ServerTransport if you have a local account for the server
|
||||||
|
transport = wrapper.get_transport()
|
||||||
|
```
|
||||||
|
"""
|
||||||
|
|
||||||
|
stream_url: str = None
|
||||||
|
use_ssl: bool = True
|
||||||
|
host: str = None
|
||||||
|
stream_id: str = None
|
||||||
|
commit_id: str = None
|
||||||
|
object_id: str = None
|
||||||
|
branch_name: str = None
|
||||||
|
_client: SpeckleClient = None
|
||||||
|
_account: Account = None
|
||||||
|
|
||||||
|
def __init__(self, url: str) -> None:
|
||||||
|
super().__init__(url=url)
|
||||||
|
|
||||||
|
def get_account(self, token: str = None) -> Account:
|
||||||
|
"""
|
||||||
|
Gets an account object for this server from the local accounts db
|
||||||
|
(added via Speckle Manager or a json file)
|
||||||
|
"""
|
||||||
|
metrics.track(metrics.SDK, custom_props={"name": "Stream Wrapper Get Account"})
|
||||||
|
return super().get_account(token)
|
||||||
|
|
||||||
|
def get_client(self, token: str = None) -> SpeckleClient:
|
||||||
|
"""
|
||||||
|
Gets an authenticated client for this server.
|
||||||
|
You may provide a token if there aren't any local accounts on this
|
||||||
|
machine. If no account is found and no token is provided,
|
||||||
|
an unauthenticated client is returned.
|
||||||
|
|
||||||
|
Arguments:
|
||||||
|
token {str}
|
||||||
|
-- optional token if no local account is available (defaults to None)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
SpeckleClient
|
||||||
|
-- authenticated with a corresponding local account or the provided token
|
||||||
|
"""
|
||||||
|
metrics.track(metrics.SDK, custom_props={"name": "Stream Wrapper Get Client"})
|
||||||
|
return super().get_client(token)
|
||||||
|
|
||||||
|
def get_transport(self, token: str = None) -> ServerTransport:
|
||||||
|
"""
|
||||||
|
Gets a server transport for this stream using an authenticated client.
|
||||||
|
If there is no local account for this
|
||||||
|
server and the client was not authenticated with a token,
|
||||||
|
this will throw an exception.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
ServerTransport -- constructed for this stream
|
||||||
|
with a pre-authenticated client
|
||||||
|
"""
|
||||||
|
metrics.track(
|
||||||
|
metrics.SDK, custom_props={"name": "Stream Wrapper Get Transport"}
|
||||||
|
)
|
||||||
|
return super().get_transport(token)
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
"""
|
||||||
|
This is the Core SDK module of `specklepy`.
|
||||||
|
|
||||||
|
This module should be kept in sync with the functionalities of our other SDKs especially
|
||||||
|
C# Core https://github.com/specklesystems/speckle-sharp/tree/main/Core/Core
|
||||||
|
"""
|
||||||
@@ -0,0 +1,257 @@
|
|||||||
|
import contextlib
|
||||||
|
import re
|
||||||
|
from typing import Dict
|
||||||
|
from warnings import warn
|
||||||
|
|
||||||
|
from gql import Client
|
||||||
|
from gql.transport.exceptions import TransportServerError
|
||||||
|
from gql.transport.requests import RequestsHTTPTransport
|
||||||
|
from gql.transport.websockets import WebsocketsTransport
|
||||||
|
|
||||||
|
from specklepy.core.api.credentials import Account
|
||||||
|
from specklepy.core.api.resources import (
|
||||||
|
ActiveUserResource,
|
||||||
|
FileImportResource,
|
||||||
|
ModelResource,
|
||||||
|
OtherUserResource,
|
||||||
|
ProjectInviteResource,
|
||||||
|
ProjectResource,
|
||||||
|
ServerResource,
|
||||||
|
SubscriptionResource,
|
||||||
|
VersionResource,
|
||||||
|
WorkspaceResource,
|
||||||
|
)
|
||||||
|
from specklepy.logging import metrics
|
||||||
|
from specklepy.logging.exceptions import SpeckleException, SpeckleWarning
|
||||||
|
|
||||||
|
|
||||||
|
class SpeckleClient:
|
||||||
|
"""
|
||||||
|
The `SpeckleClient` is your entry point for interacting with
|
||||||
|
your Speckle Server's GraphQL API.
|
||||||
|
You'll need to have access to a server to use it,
|
||||||
|
or you can use our public server `app.speckle.systems`.
|
||||||
|
|
||||||
|
To authenticate the client, you'll need to have downloaded
|
||||||
|
the [Speckle Manager](https://speckle.guide/#speckle-manager)
|
||||||
|
and added your account.
|
||||||
|
|
||||||
|
```py
|
||||||
|
from specklepy.api.client import SpeckleClient
|
||||||
|
from specklepy.core.api.inputs.project_inputs import ProjectCreateInput
|
||||||
|
from specklepy.api.credentials import get_default_account
|
||||||
|
|
||||||
|
# initialise the client
|
||||||
|
client = SpeckleClient(host="app.speckle.systems") # or whatever your host is
|
||||||
|
# client = SpeckleClient(host="localhost:3000", use_ssl=False) or use local server
|
||||||
|
|
||||||
|
# authenticate the client with an account
|
||||||
|
# (account has been added in Speckle Manager)
|
||||||
|
account = get_default_account()
|
||||||
|
client.authenticate_with_account(account)
|
||||||
|
|
||||||
|
# create a new project
|
||||||
|
input = ProjectCreateInput(name="a shiny new project")
|
||||||
|
project = self.project.create(input)
|
||||||
|
|
||||||
|
# or, use a project id to get an existing project from the server
|
||||||
|
new_stream = client.project.get("abcdefghij")
|
||||||
|
```
|
||||||
|
"""
|
||||||
|
|
||||||
|
DEFAULT_HOST = "app.speckle.systems"
|
||||||
|
USE_SSL = True
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
host: str = DEFAULT_HOST,
|
||||||
|
use_ssl: bool = USE_SSL,
|
||||||
|
verify_certificate: bool = True,
|
||||||
|
connection_retries: int = 3,
|
||||||
|
connection_timeout: int = 10,
|
||||||
|
) -> None:
|
||||||
|
ws_protocol = "ws"
|
||||||
|
http_protocol = "http"
|
||||||
|
|
||||||
|
if use_ssl:
|
||||||
|
ws_protocol = "wss"
|
||||||
|
http_protocol = "https"
|
||||||
|
|
||||||
|
# sanitise host input by removing protocol and trailing slash
|
||||||
|
host = re.sub(r"((^\w+:|^)\/\/)|(\/$)", "", host)
|
||||||
|
|
||||||
|
self.url = f"{http_protocol}://{host}"
|
||||||
|
self.graphql = f"{self.url}/graphql"
|
||||||
|
self.ws_url = f"{ws_protocol}://{host}/graphql"
|
||||||
|
self.account = Account()
|
||||||
|
self.verify_certificate = verify_certificate
|
||||||
|
self.connection_retries = connection_retries
|
||||||
|
self.connection_timeout = connection_timeout
|
||||||
|
|
||||||
|
self.httpclient = Client(
|
||||||
|
transport=RequestsHTTPTransport(
|
||||||
|
url=self.graphql,
|
||||||
|
verify=self.verify_certificate,
|
||||||
|
retries=self.connection_retries,
|
||||||
|
timeout=self.connection_timeout,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self.wsclient = None
|
||||||
|
|
||||||
|
self._init_resources()
|
||||||
|
|
||||||
|
# ? Check compatibility with the server
|
||||||
|
# - i think we can skip this at this point? save a request
|
||||||
|
# try:
|
||||||
|
# server_info = self.server.get()
|
||||||
|
# if isinstance(server_info, Exception):
|
||||||
|
# raise server_info
|
||||||
|
# if not isinstance(server_info, ServerInfo):
|
||||||
|
# raise Exception("Couldn't get ServerInfo")
|
||||||
|
# except Exception as ex:
|
||||||
|
# raise SpeckleException(
|
||||||
|
# f"{self.url} is not a compatible Speckle Server", ex
|
||||||
|
# ) from ex
|
||||||
|
|
||||||
|
def __repr__(self):
|
||||||
|
return (
|
||||||
|
f"SpeckleClient( server: {self.url}, authenticated:"
|
||||||
|
f" {self.account.token is not None} )"
|
||||||
|
)
|
||||||
|
|
||||||
|
def authenticate_with_token(self, token: str) -> None:
|
||||||
|
"""
|
||||||
|
Authenticate the client using a personal access token.
|
||||||
|
The token is saved in the client object and a synchronous GraphQL
|
||||||
|
entrypoint is created
|
||||||
|
|
||||||
|
Arguments:
|
||||||
|
token {str} -- an api token
|
||||||
|
"""
|
||||||
|
self.account = Account.from_token(token, self.url)
|
||||||
|
self._set_up_client()
|
||||||
|
|
||||||
|
userData = self.active_user.get()
|
||||||
|
|
||||||
|
# None if the token lacked the profile:read scope or if it was None
|
||||||
|
if userData:
|
||||||
|
self.account.userInfo.id = userData.id
|
||||||
|
self.account.userInfo.email = userData.email
|
||||||
|
self.account.userInfo.name = userData.name
|
||||||
|
self.account.userInfo.company = userData.company
|
||||||
|
self.account.userInfo.avatar = userData.avatar
|
||||||
|
|
||||||
|
self.account.serverInfo = self.server.get()
|
||||||
|
self.account.serverInfo.url = self.url
|
||||||
|
|
||||||
|
def authenticate_with_account(self, account: Account) -> None:
|
||||||
|
"""Authenticate the client using an Account object
|
||||||
|
The account is saved in the client object and a synchronous GraphQL
|
||||||
|
entrypoint is created
|
||||||
|
|
||||||
|
Arguments:
|
||||||
|
account {Account} -- the account object which can be found with
|
||||||
|
`get_default_account` or `get_local_accounts`
|
||||||
|
"""
|
||||||
|
self.account = account
|
||||||
|
self._set_up_client()
|
||||||
|
|
||||||
|
try:
|
||||||
|
_ = self.active_user.get()
|
||||||
|
except SpeckleException as ex:
|
||||||
|
if isinstance(ex.exception, TransportServerError):
|
||||||
|
if ex.exception.code == 403:
|
||||||
|
warn(
|
||||||
|
SpeckleWarning(
|
||||||
|
"Possibly invalid token - could not authenticate "
|
||||||
|
f"Speckle Client for server {self.url}"
|
||||||
|
),
|
||||||
|
stacklevel=2,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
raise ex
|
||||||
|
|
||||||
|
def _set_up_client(self) -> None:
|
||||||
|
headers = {
|
||||||
|
"Authorization": f"Bearer {self.account.token}",
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
"apollographql-client-name": metrics.HOST_APP,
|
||||||
|
"apollographql-client-version": metrics.HOST_APP_VERSION,
|
||||||
|
}
|
||||||
|
httptransport = RequestsHTTPTransport(
|
||||||
|
url=self.graphql, headers=headers, verify=self.verify_certificate, retries=3
|
||||||
|
)
|
||||||
|
wstransport = WebsocketsTransport(
|
||||||
|
url=self.ws_url,
|
||||||
|
init_payload={"Authorization": f"Bearer {self.account.token}"},
|
||||||
|
)
|
||||||
|
self.httpclient = Client(transport=httptransport)
|
||||||
|
self.wsclient = Client(transport=wstransport)
|
||||||
|
|
||||||
|
self._init_resources()
|
||||||
|
|
||||||
|
def execute_query(self, query: str) -> Dict:
|
||||||
|
return self.httpclient.execute(query)
|
||||||
|
|
||||||
|
def _init_resources(self) -> None:
|
||||||
|
self.server = ServerResource(
|
||||||
|
account=self.account, basepath=self.url, client=self.httpclient
|
||||||
|
)
|
||||||
|
|
||||||
|
server_version = None
|
||||||
|
with contextlib.suppress(Exception):
|
||||||
|
server_version = self.server.version()
|
||||||
|
|
||||||
|
self.other_user = OtherUserResource(
|
||||||
|
account=self.account,
|
||||||
|
basepath=self.url,
|
||||||
|
client=self.httpclient,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
self.active_user = ActiveUserResource(
|
||||||
|
account=self.account,
|
||||||
|
basepath=self.url,
|
||||||
|
client=self.httpclient,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
self.project = ProjectResource(
|
||||||
|
account=self.account,
|
||||||
|
basepath=self.url,
|
||||||
|
client=self.httpclient,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
self.project_invite = ProjectInviteResource(
|
||||||
|
account=self.account,
|
||||||
|
basepath=self.url,
|
||||||
|
client=self.httpclient,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
self.model = ModelResource(
|
||||||
|
account=self.account,
|
||||||
|
basepath=self.url,
|
||||||
|
client=self.httpclient,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
self.version = VersionResource(
|
||||||
|
account=self.account,
|
||||||
|
basepath=self.url,
|
||||||
|
client=self.httpclient,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
self.workspace = WorkspaceResource(
|
||||||
|
account=self.account,
|
||||||
|
basepath=self.url,
|
||||||
|
client=self.httpclient,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
self.file_import = FileImportResource(
|
||||||
|
account=self.account,
|
||||||
|
basepath=self.url,
|
||||||
|
client=self.httpclient,
|
||||||
|
server_version=server_version,
|
||||||
|
)
|
||||||
|
self.subscription = SubscriptionResource(
|
||||||
|
account=self.account,
|
||||||
|
basepath=self.ws_url,
|
||||||
|
client=self.wsclient,
|
||||||
|
)
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
from datetime import datetime
|
||||||
|
from typing import List
|
||||||
|
|
||||||
|
import httpx
|
||||||
|
from pydantic import AliasGenerator, BaseModel, ConfigDict, HttpUrl
|
||||||
|
from pydantic.alias_generators import to_pascal
|
||||||
|
|
||||||
|
|
||||||
|
class ConnectorFeedBaseModel(BaseModel):
|
||||||
|
"""
|
||||||
|
Parent class for all Connector Feed Object Model classes
|
||||||
|
Sets-up a pydantic config to serialize properties using a pascal case alias
|
||||||
|
"""
|
||||||
|
|
||||||
|
model_config = ConfigDict(
|
||||||
|
alias_generator=AliasGenerator(
|
||||||
|
validation_alias=to_pascal,
|
||||||
|
),
|
||||||
|
populate_by_name=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class ConnectorVersion(ConnectorFeedBaseModel):
|
||||||
|
number: str
|
||||||
|
url: HttpUrl
|
||||||
|
os: int # this is an enum, it's properly defined in the old v2 SDK (used by Speckle.Manager.Feed) # noqa: E501
|
||||||
|
architecture: int # These are enums, they are properly defined in the old v2 SDK (used by Speckle.Manager.Feed) # noqa: E501
|
||||||
|
date: datetime
|
||||||
|
prerelease: bool
|
||||||
|
|
||||||
|
|
||||||
|
class ConnectorVersions(ConnectorFeedBaseModel):
|
||||||
|
versions: List[ConnectorVersion]
|
||||||
|
|
||||||
|
|
||||||
|
def get_latest_version(host_app_slug: str, allow_pre_release: bool) -> ConnectorVersion:
|
||||||
|
"""
|
||||||
|
Fetches the JSON feed for the given connector slug and
|
||||||
|
Returns the latest version by date - Note, it does not consider semvers!
|
||||||
|
|
||||||
|
Arguments:
|
||||||
|
host_app_slug {str} -- the host app slug to query for
|
||||||
|
allow_pre_release {bool} -- if false, only stable releases will be considered
|
||||||
|
Raises:
|
||||||
|
HTTPStatusError: if http request failed
|
||||||
|
ValidationError: response was not valid json
|
||||||
|
ValueError: The feed contained no connector versions
|
||||||
|
"""
|
||||||
|
connector_versions = get_connector_versions(host_app_slug).versions
|
||||||
|
filtered_versions = [
|
||||||
|
v for v in connector_versions if allow_pre_release or not v.prerelease
|
||||||
|
]
|
||||||
|
|
||||||
|
return max(filtered_versions, key=lambda x: x.date)
|
||||||
|
|
||||||
|
|
||||||
|
def get_connector_versions(host_app_slug: str) -> ConnectorVersions:
|
||||||
|
"""
|
||||||
|
Fetches the JSON feed for the given slug (v3 feeds only)
|
||||||
|
Raises:
|
||||||
|
HTTPStatusError: if http request failed
|
||||||
|
ValidationError: response was not valid json
|
||||||
|
"""
|
||||||
|
url = f"https://releases.speckle.dev/manager2/feeds/{host_app_slug.lower()}-v3.json"
|
||||||
|
|
||||||
|
res = httpx.get(url).raise_for_status()
|
||||||
|
|
||||||
|
feed_data = ConnectorVersions.model_validate_json(res.text)
|
||||||
|
|
||||||
|
return feed_data
|
||||||
@@ -0,0 +1,177 @@
|
|||||||
|
import os
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import List
|
||||||
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
|
from pydantic import BaseModel, Field # pylint: disable=no-name-in-module
|
||||||
|
|
||||||
|
from specklepy.core.api.models import ServerInfo
|
||||||
|
from specklepy.core.helpers import speckle_path_provider
|
||||||
|
from specklepy.logging.exceptions import SpeckleException
|
||||||
|
from specklepy.transports.sqlite import SQLiteTransport
|
||||||
|
|
||||||
|
|
||||||
|
class UserInfo(BaseModel):
|
||||||
|
id: str | None = None
|
||||||
|
name: str | None = None
|
||||||
|
email: str | None = None
|
||||||
|
company: str | None = None
|
||||||
|
avatar: str | None = None
|
||||||
|
|
||||||
|
|
||||||
|
class Account(BaseModel):
|
||||||
|
isDefault: bool = False
|
||||||
|
token: str | None = None
|
||||||
|
refreshToken: str | None = None
|
||||||
|
serverInfo: ServerInfo = Field(default_factory=ServerInfo)
|
||||||
|
userInfo: UserInfo = Field(default_factory=UserInfo)
|
||||||
|
id: str | None = None
|
||||||
|
|
||||||
|
def __repr__(self) -> str:
|
||||||
|
return (
|
||||||
|
f"Account(email: {self.userInfo.email}, server: {self.serverInfo.url},"
|
||||||
|
f" isDefault: {self.isDefault})"
|
||||||
|
)
|
||||||
|
|
||||||
|
def __str__(self) -> str:
|
||||||
|
return self.__repr__()
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_token(cls, token: str, server_url: str | None = None):
|
||||||
|
acct = cls(token=token)
|
||||||
|
acct.serverInfo.url = server_url
|
||||||
|
return acct
|
||||||
|
|
||||||
|
|
||||||
|
def get_local_accounts(base_path: str | None = None) -> List[Account]:
|
||||||
|
"""Gets all the accounts present in this environment
|
||||||
|
|
||||||
|
Arguments:
|
||||||
|
base_path {str} -- custom base path if you are not using the system default
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
List[Account] -- list of all local accounts or an empty list if
|
||||||
|
no accounts were found
|
||||||
|
"""
|
||||||
|
accounts: List[Account] = []
|
||||||
|
try:
|
||||||
|
account_storage = SQLiteTransport(scope="Accounts", base_path=base_path)
|
||||||
|
res = account_storage.get_all_objects()
|
||||||
|
account_storage.close()
|
||||||
|
if res:
|
||||||
|
accounts.extend(Account.model_validate_json(r[1]) for r in res)
|
||||||
|
except SpeckleException:
|
||||||
|
# cannot open SQLiteTransport, probably because of the lack
|
||||||
|
# of disk write permissions
|
||||||
|
pass
|
||||||
|
|
||||||
|
json_acct_files = []
|
||||||
|
json_path = str(speckle_path_provider.accounts_folder_path())
|
||||||
|
try:
|
||||||
|
os.makedirs(json_path, exist_ok=True)
|
||||||
|
json_acct_files.extend(
|
||||||
|
file for file in os.listdir(json_path) if file.endswith(".json")
|
||||||
|
)
|
||||||
|
|
||||||
|
except Exception:
|
||||||
|
# cannot find or get the json account paths
|
||||||
|
pass
|
||||||
|
|
||||||
|
if json_acct_files:
|
||||||
|
try:
|
||||||
|
accounts.extend(
|
||||||
|
Account.model_validate_json(Path(json_path, json_file).read_text())
|
||||||
|
# Account.parse_file(os.path.join(json_path, json_file))
|
||||||
|
for json_file in json_acct_files
|
||||||
|
)
|
||||||
|
except Exception as ex:
|
||||||
|
raise SpeckleException(
|
||||||
|
"Invalid json accounts could not be read. Please fix or remove them.",
|
||||||
|
ex,
|
||||||
|
) from ex
|
||||||
|
|
||||||
|
return accounts
|
||||||
|
|
||||||
|
|
||||||
|
def get_default_account(base_path: str | None = None) -> Account | None:
|
||||||
|
"""
|
||||||
|
Gets this environment's default account if any. If there is no default,
|
||||||
|
the first found will be returned and set as default.
|
||||||
|
Arguments:
|
||||||
|
base_path {str} -- custom base path if you are not using the system default
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Account -- the default account or None if no local accounts were found
|
||||||
|
"""
|
||||||
|
accounts = get_local_accounts(base_path=base_path)
|
||||||
|
if not accounts:
|
||||||
|
return None
|
||||||
|
|
||||||
|
default = next((acc for acc in accounts if acc.isDefault), None)
|
||||||
|
if not default:
|
||||||
|
default = accounts[0]
|
||||||
|
default.isDefault = True
|
||||||
|
# metrics.initialise_tracker(default)
|
||||||
|
|
||||||
|
return default
|
||||||
|
|
||||||
|
|
||||||
|
def get_account_from_token(token: str, server_url: str | None = None) -> Account:
|
||||||
|
"""Gets the local account for the token if it exists
|
||||||
|
Arguments:
|
||||||
|
token {str} -- the api token
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Account -- the local account with this token or a shell account containing
|
||||||
|
just the token and url if no local account is found
|
||||||
|
"""
|
||||||
|
accounts = get_local_accounts()
|
||||||
|
if not accounts:
|
||||||
|
return Account.from_token(token, server_url)
|
||||||
|
|
||||||
|
acct = next((acc for acc in accounts if acc.token == token), None)
|
||||||
|
if acct:
|
||||||
|
return acct
|
||||||
|
|
||||||
|
if server_url:
|
||||||
|
url = server_url.lower()
|
||||||
|
acct = next(
|
||||||
|
(acc for acc in accounts if url in acc.serverInfo.url.lower()), None
|
||||||
|
)
|
||||||
|
if acct:
|
||||||
|
return acct
|
||||||
|
|
||||||
|
return Account.from_token(token, server_url)
|
||||||
|
|
||||||
|
|
||||||
|
def get_accounts_for_server(host: str) -> List[Account]:
|
||||||
|
all_accounts = get_local_accounts()
|
||||||
|
filtered: List[Account] = []
|
||||||
|
|
||||||
|
for acc in all_accounts:
|
||||||
|
moved_from = (
|
||||||
|
acc.serverInfo.migration.moved_from if acc.serverInfo.migration else None
|
||||||
|
)
|
||||||
|
|
||||||
|
if moved_from and host == urlparse(moved_from).netloc:
|
||||||
|
filtered.append(acc)
|
||||||
|
|
||||||
|
for acc in all_accounts:
|
||||||
|
if any([x for x in filtered if x.userInfo.id == acc.userInfo.id]):
|
||||||
|
continue
|
||||||
|
|
||||||
|
if host == urlparse(acc.serverInfo.url).netloc:
|
||||||
|
filtered.append(acc)
|
||||||
|
|
||||||
|
return filtered
|
||||||
|
|
||||||
|
|
||||||
|
class StreamWrapper:
|
||||||
|
def __init__(self, url: str = None) -> None:
|
||||||
|
raise SpeckleException(
|
||||||
|
message=(
|
||||||
|
"The StreamWrapper has moved as of v2.6.0! Please import from"
|
||||||
|
" specklepy.api.wrapper"
|
||||||
|
),
|
||||||
|
exception=DeprecationWarning(),
|
||||||
|
)
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
from enum import Enum
|
||||||
|
|
||||||
|
|
||||||
|
class ProjectVisibility(str, Enum):
|
||||||
|
"""Supported project visibility types"""
|
||||||
|
|
||||||
|
PRIVATE = "PRIVATE"
|
||||||
|
PUBLIC = "PUBLIC"
|
||||||
|
UNLISTED = "UNLISTED"
|
||||||
|
WORKSPACE = "WORKSPACE"
|
||||||
|
|
||||||
|
|
||||||
|
class UserProjectsUpdatedMessageType(str, Enum):
|
||||||
|
ADDED = "ADDED"
|
||||||
|
REMOVED = "REMOVED"
|
||||||
|
|
||||||
|
|
||||||
|
class ProjectModelsUpdatedMessageType(str, Enum):
|
||||||
|
CREATED = "CREATED"
|
||||||
|
DELETED = "DELETED"
|
||||||
|
UPDATED = "UPDATED"
|
||||||
|
|
||||||
|
|
||||||
|
class ProjectUpdatedMessageType(str, Enum):
|
||||||
|
DELETED = "DELETED"
|
||||||
|
UPDATED = "UPDATED"
|
||||||
|
|
||||||
|
|
||||||
|
class ProjectVersionsUpdatedMessageType(str, Enum):
|
||||||
|
CREATED = "CREATED"
|
||||||
|
DELETED = "DELETED"
|
||||||
|
UPDATED = "UPDATED"
|
||||||
@@ -0,0 +1,116 @@
|
|||||||
|
from dataclasses import dataclass
|
||||||
|
from enum import Enum
|
||||||
|
from unicodedata import name
|
||||||
|
|
||||||
|
|
||||||
|
class HostAppVersion(Enum):
|
||||||
|
v = "v"
|
||||||
|
v6 = "v6"
|
||||||
|
v7 = "v7"
|
||||||
|
v2019 = "v2019"
|
||||||
|
v2020 = "v2020"
|
||||||
|
v2021 = "v2021"
|
||||||
|
v2022 = "v2022"
|
||||||
|
v2023 = "v2023"
|
||||||
|
v2024 = "v2024"
|
||||||
|
v2025 = "v2025"
|
||||||
|
vSandbox = "vSandbox"
|
||||||
|
vRevit = "vRevit"
|
||||||
|
vRevit2021 = "vRevit2021"
|
||||||
|
vRevit2022 = "vRevit2022"
|
||||||
|
vRevit2023 = "vRevit2023"
|
||||||
|
vRevit2024 = "vRevit2024"
|
||||||
|
vRevit2025 = "vRevit2025"
|
||||||
|
v25 = "v25"
|
||||||
|
v26 = "v26"
|
||||||
|
|
||||||
|
def __repr__(self) -> str:
|
||||||
|
return self.value
|
||||||
|
|
||||||
|
def __str__(self) -> str:
|
||||||
|
return self.value
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class HostApplication:
|
||||||
|
name: str
|
||||||
|
slug: str
|
||||||
|
|
||||||
|
def get_version(self, version: HostAppVersion) -> str:
|
||||||
|
return f"{name.replace(' ', '')}{str(version).strip('v')}"
|
||||||
|
|
||||||
|
|
||||||
|
RHINO = HostApplication("Rhino", "rhino")
|
||||||
|
GRASSHOPPER = HostApplication("Grasshopper", "grasshopper")
|
||||||
|
REVIT = HostApplication("Revit", "revit")
|
||||||
|
DYNAMO = HostApplication("Dynamo", "dynamo")
|
||||||
|
UNITY = HostApplication("Unity", "unity")
|
||||||
|
GSA = HostApplication("GSA", "gsa")
|
||||||
|
CIVIL = HostApplication("Civil 3D", "civil3d")
|
||||||
|
AUTOCAD = HostApplication("AutoCAD", "autocad")
|
||||||
|
MICROSTATION = HostApplication("MicroStation", "microstation")
|
||||||
|
OPENROADS = HostApplication("OpenRoads", "openroads")
|
||||||
|
OPENRAIL = HostApplication("OpenRail", "openrail")
|
||||||
|
OPENBUILDINGS = HostApplication("OpenBuildings", "openbuildings")
|
||||||
|
ETABS = HostApplication("ETABS", "etabs")
|
||||||
|
SAP2000 = HostApplication("SAP2000", "sap2000")
|
||||||
|
CSIBRIDGE = HostApplication("CSIBridge", "csibridge")
|
||||||
|
SAFE = HostApplication("SAFE", "safe")
|
||||||
|
TEKLASTRUCTURES = HostApplication("Tekla Structures", "teklastructures")
|
||||||
|
DXF = HostApplication("DXF Converter", "dxf")
|
||||||
|
EXCEL = HostApplication("Excel", "excel")
|
||||||
|
UNREAL = HostApplication("Unreal", "unreal")
|
||||||
|
POWERBI = HostApplication("Power BI", "powerbi")
|
||||||
|
BLENDER = HostApplication("Blender", "blender")
|
||||||
|
QGIS = HostApplication("QGIS", "qgis")
|
||||||
|
ARCGIS = HostApplication("ArcGIS", "arcgis")
|
||||||
|
SKETCHUP = HostApplication("SketchUp", "sketchup")
|
||||||
|
ARCHICAD = HostApplication("Archicad", "archicad")
|
||||||
|
TOPSOLID = HostApplication("TopSolid", "topsolid")
|
||||||
|
PYTHON = HostApplication("Python", "python")
|
||||||
|
NET = HostApplication(".NET", "net")
|
||||||
|
OTHER = HostApplication("Other", "other")
|
||||||
|
|
||||||
|
_app_name_host_app_mapping = {
|
||||||
|
"dynamo": DYNAMO,
|
||||||
|
"revit": REVIT,
|
||||||
|
"autocad": AUTOCAD,
|
||||||
|
"civil": CIVIL,
|
||||||
|
"rhino": RHINO,
|
||||||
|
"grasshopper": GRASSHOPPER,
|
||||||
|
"unity": UNITY,
|
||||||
|
"gsa": GSA,
|
||||||
|
"microstation": MICROSTATION,
|
||||||
|
"openroads": OPENROADS,
|
||||||
|
"openrail": OPENRAIL,
|
||||||
|
"openbuildings": OPENBUILDINGS,
|
||||||
|
"etabs": ETABS,
|
||||||
|
"sap": SAP2000,
|
||||||
|
"csibridge": CSIBRIDGE,
|
||||||
|
"safe": SAFE,
|
||||||
|
"teklastructures": TEKLASTRUCTURES,
|
||||||
|
"dxf": DXF,
|
||||||
|
"excel": EXCEL,
|
||||||
|
"unreal": UNREAL,
|
||||||
|
"powerbi": POWERBI,
|
||||||
|
"blender": BLENDER,
|
||||||
|
"qgis": QGIS,
|
||||||
|
"arcgis": ARCGIS,
|
||||||
|
"sketchup": SKETCHUP,
|
||||||
|
"archicad": ARCHICAD,
|
||||||
|
"topsolid": TOPSOLID,
|
||||||
|
"python": PYTHON,
|
||||||
|
"net": NET,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def get_host_app_from_string(app_name: str) -> HostApplication:
|
||||||
|
app_name = app_name.lower().replace(" ", "")
|
||||||
|
for partial_app_name, host_app in _app_name_host_app_mapping.items():
|
||||||
|
if partial_app_name in app_name:
|
||||||
|
return host_app
|
||||||
|
return HostApplication(app_name, app_name)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
print(HostAppVersion.v)
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
from specklepy.core.api.inputs.file_import_inputs import (
|
||||||
|
FileImportErrorInput,
|
||||||
|
FileImportSuccessInput,
|
||||||
|
FinishFileImportInput,
|
||||||
|
GenerateFileUploadUrlInput,
|
||||||
|
StartFileImportInput,
|
||||||
|
)
|
||||||
|
from specklepy.core.api.inputs.model_inputs import (
|
||||||
|
CreateModelInput,
|
||||||
|
DeleteModelInput,
|
||||||
|
ModelVersionsFilter,
|
||||||
|
UpdateModelInput,
|
||||||
|
)
|
||||||
|
from specklepy.core.api.inputs.project_inputs import (
|
||||||
|
ProjectCreateInput,
|
||||||
|
ProjectInviteCreateInput,
|
||||||
|
ProjectInviteUseInput,
|
||||||
|
ProjectModelsFilter,
|
||||||
|
ProjectUpdateInput,
|
||||||
|
ProjectUpdateRoleInput,
|
||||||
|
)
|
||||||
|
from specklepy.core.api.inputs.user_inputs import UserProjectsFilter, UserUpdateInput
|
||||||
|
from specklepy.core.api.inputs.version_inputs import (
|
||||||
|
CreateVersionInput,
|
||||||
|
DeleteVersionsInput,
|
||||||
|
MarkReceivedVersionInput,
|
||||||
|
MoveVersionsInput,
|
||||||
|
UpdateVersionInput,
|
||||||
|
)
|
||||||
|
|
||||||
|
__all__ = [
|
||||||
|
"FileImportErrorInput",
|
||||||
|
"FileImportSuccessInput",
|
||||||
|
"FinishFileImportInput",
|
||||||
|
"StartFileImportInput",
|
||||||
|
"GenerateFileUploadUrlInput",
|
||||||
|
"CreateModelInput",
|
||||||
|
"DeleteModelInput",
|
||||||
|
"UpdateModelInput",
|
||||||
|
"ModelVersionsFilter",
|
||||||
|
"ProjectCreateInput",
|
||||||
|
"ProjectInviteCreateInput",
|
||||||
|
"ProjectInviteUseInput",
|
||||||
|
"ProjectModelsFilter",
|
||||||
|
"ProjectUpdateInput",
|
||||||
|
"ProjectUpdateRoleInput",
|
||||||
|
"UserProjectsFilter",
|
||||||
|
"UserUpdateInput",
|
||||||
|
"UpdateVersionInput",
|
||||||
|
"MoveVersionsInput",
|
||||||
|
"DeleteVersionsInput",
|
||||||
|
"CreateVersionInput",
|
||||||
|
"MarkReceivedVersionInput",
|
||||||
|
]
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
from typing import Literal
|
||||||
|
|
||||||
|
from pydantic import Field
|
||||||
|
|
||||||
|
from specklepy.core.api.models.graphql_base_model import GraphQLBaseModel
|
||||||
|
|
||||||
|
|
||||||
|
class GenerateFileUploadUrlInput(GraphQLBaseModel):
|
||||||
|
project_id: str
|
||||||
|
file_name: str
|
||||||
|
|
||||||
|
|
||||||
|
class StartFileImportInput(GraphQLBaseModel):
|
||||||
|
project_id: str
|
||||||
|
model_id: str
|
||||||
|
file_id: str
|
||||||
|
etag: str
|
||||||
|
|
||||||
|
|
||||||
|
class FileImportResult(GraphQLBaseModel):
|
||||||
|
duration_seconds: float
|
||||||
|
download_duration_seconds: float
|
||||||
|
parse_duration_seconds: float
|
||||||
|
parser: str
|
||||||
|
version_id: str | None
|
||||||
|
|
||||||
|
|
||||||
|
class FileImportInputBase(GraphQLBaseModel):
|
||||||
|
project_id: str
|
||||||
|
job_id: str
|
||||||
|
warnings: list[str] = Field(default_factory=list)
|
||||||
|
result: FileImportResult
|
||||||
|
|
||||||
|
|
||||||
|
class FileImportSuccessInput(FileImportInputBase):
|
||||||
|
status: Literal["success"] = "success"
|
||||||
|
|
||||||
|
|
||||||
|
class FileImportErrorInput(FileImportInputBase):
|
||||||
|
status: Literal["error"] = "error"
|
||||||
|
reason: str
|
||||||
|
|
||||||
|
|
||||||
|
FinishFileImportInput = FileImportSuccessInput | FileImportErrorInput
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
from typing import Optional, Sequence
|
||||||
|
|
||||||
|
from specklepy.core.api.models.graphql_base_model import GraphQLBaseModel
|
||||||
|
|
||||||
|
|
||||||
|
class CreateModelInput(GraphQLBaseModel):
|
||||||
|
name: str
|
||||||
|
description: Optional[str] = None
|
||||||
|
project_id: str
|
||||||
|
|
||||||
|
|
||||||
|
class DeleteModelInput(GraphQLBaseModel):
|
||||||
|
id: str
|
||||||
|
project_id: str
|
||||||
|
|
||||||
|
|
||||||
|
class UpdateModelInput(GraphQLBaseModel):
|
||||||
|
id: str
|
||||||
|
name: Optional[str] = None
|
||||||
|
description: Optional[str] = None
|
||||||
|
project_id: str
|
||||||
|
|
||||||
|
|
||||||
|
class ModelVersionsFilter(GraphQLBaseModel):
|
||||||
|
priority_ids: Sequence[str]
|
||||||
|
priority_ids_only: Optional[bool] = None
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user