ivoryos 1.2.6__py3-none-any.whl → 1.2.7__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of ivoryos might be problematic. Click here for more details.

Files changed (7) hide show
  1. ivoryos/routes/control/control.py +10 -1
  2. ivoryos/version.py +1 -1
  3. {ivoryos-1.2.6.dist-info → ivoryos-1.2.7.dist-info}/METADATA +1 -1
  4. {ivoryos-1.2.6.dist-info → ivoryos-1.2.7.dist-info}/RECORD +7 -7
  5. {ivoryos-1.2.6.dist-info → ivoryos-1.2.7.dist-info}/WHEEL +0 -0
  6. {ivoryos-1.2.6.dist-info → ivoryos-1.2.7.dist-info}/licenses/LICENSE +0 -0
  7. {ivoryos-1.2.6.dist-info → ivoryos-1.2.7.dist-info}/top_level.txt +0 -0
ivoryos/routes/control/control.py CHANGED
@@ -49,6 +49,14 @@ def deck_controllers(instrument: str = None):
49
49
  if instrument:
50
50
  inst_object = find_instrument_by_name(instrument)
51
51
  forms = create_form_from_module(sdl_module=inst_object, autofill=False, design=False)
52
+ order = get_session_by_instrument('card_order', instrument)
53
+ hidden_functions = get_session_by_instrument('hidden_functions', instrument)
54
+ functions = list(forms.keys())
55
+ for function in functions:
56
+ if function not in hidden_functions and function not in order:
57
+ order.append(function)
58
+ post_session_by_instrument('card_order', instrument, order)
59
+ forms = {name: forms[name] for name in order if name in forms}
52
60
 
53
61
  if request.method == "POST":
54
62
  if not forms:
@@ -83,7 +91,8 @@ def deck_controllers(instrument: str = None):
83
91
  flash(f"Run Error! {output.get('output', 'Unknown error occurred.')}", "error")
84
92
 
85
93
  # GET request → render web form or return snapshot for API
86
- if request.is_json or request.accept_mimetypes["application/json"]:
94
+ if request.is_json or request.accept_mimetypes.best_match(['application/json', 'text/html']) == 'application/json':
95
+
87
96
  snapshot = global_config.deck_snapshot.copy()
88
97
  for instrument_key, instrument_data in snapshot.items():
89
98
  for function_key, function_data in instrument_data.items():
ivoryos/version.py CHANGED
@@ -1 +1 @@
1
- __version__ = "1.2.6"
1
+ __version__ = "1.2.7"
{ivoryos-1.2.6.dist-info → ivoryos-1.2.7.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: ivoryos
3
- Version: 1.2.6
3
+ Version: 1.2.7
4
4
  Summary: an open-source Python package enabling Self-Driving Labs (SDLs) interoperability
5
5
  Author-email: Ivory Zhang <ivoryzhang@chem.ubc.ca>
6
6
  License: MIT
{ivoryos-1.2.6.dist-info → ivoryos-1.2.7.dist-info}/RECORD RENAMED
@@ -1,7 +1,7 @@
1
1
  ivoryos/__init__.py,sha256=BAA7OPl3h_QdSc4na-7OWTKhaOq1LtHOrJHX3gGITrc,9863
2
2
  ivoryos/config.py,sha256=y3RxNjiIola9tK7jg-mHM8EzLMwiLwOzoisXkDvj0gA,2174
3
3
  ivoryos/socket_handlers.py,sha256=VWVWiIdm4jYAutwGu6R0t1nK5MuMyOCL0xAnFn06jWQ,1302
4
- ivoryos/version.py,sha256=vMQK58X8_YZGKzRm0ThvPAKFtpfyejGmUnDrY9RQ13w,22
4
+ ivoryos/version.py,sha256=49prCLbE3fFzLfxem5rd2dr1iV4_L-bN0N4J7jxU5yA,22
5
5
  ivoryos/optimizer/ax_optimizer.py,sha256=PoSu8hrDFFpqyhRBnaSMswIUsDfEX6sPWt8NEZ_sobs,7112
6
6
  ivoryos/optimizer/base_optimizer.py,sha256=JTbUharZKn0t8_BDbAFuwZIbT1VOnX1Xuog1pJuU8hY,1992
7
7
  ivoryos/optimizer/baybe_optimizer.py,sha256=EdrrRiYO-IOx610cPXiQhH4qG8knUP0uiZ0YoyaGIU8,7954
@@ -13,7 +13,7 @@ ivoryos/routes/auth/auth.py,sha256=CqoP9cM8BuXVGHGujX7-0sNAOdWILU9amyBrObOD6Ss,3
13
13
  ivoryos/routes/auth/templates/login.html,sha256=WSRrKbdM_oobqSXFRTo-j9UlOgp6sYzS9tm7TqqPULI,1207
14
14
  ivoryos/routes/auth/templates/signup.html,sha256=b5LTXtpfTSkSS7X8u1ldwQbbgEFTk6UNMAediA5BwBY,1465
15
15
  ivoryos/routes/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
16
- ivoryos/routes/control/control.py,sha256=d08xFo-7Fm7hdFPBxmcf_48UsxO4ctcApm0Wxo_oPQk,5530
16
+ ivoryos/routes/control/control.py,sha256=4wqY-68PCJkhdBXzj4sb3BceI0PKViPiTLGz8VP_rU8,6059
17
17
  ivoryos/routes/control/control_file.py,sha256=3fQ9R8EcdqKs_hABn2EqRAB1xC2DHAT_q_pwsMIDDQI,864
18
18
  ivoryos/routes/control/control_new_device.py,sha256=mfJKg5JAOagIpUKbp2b5nRwvd2V3bzT3M0zIhIsEaFM,5456
19
19
  ivoryos/routes/control/utils.py,sha256=at11wA5HPAZN4BfMaymj1GKEvRTrqi4Wg6cTqUZJDjU,1155
@@ -93,8 +93,8 @@ ivoryos/utils/script_runner.py,sha256=MdLMSAeaVXxnbcQfzHJximeJ6W7uOCxqTQhFSpsEie
93
93
  ivoryos/utils/serilize.py,sha256=lkBhkz8r2bLmz2_xOb0c4ptSSOqjIu6krj5YYK4Nvj8,6784
94
94
  ivoryos/utils/task_runner.py,sha256=qgHheE2rnhgRmWUeUQHgdS-Kl-yv-9uA-eM6lD9d0b4,3018
95
95
  ivoryos/utils/utils.py,sha256=-WiU0_brszB9yDsiQepf_7SzNgPTSpul2RSKDOY3pqo,13921
96
- ivoryos-1.2.6.dist-info/licenses/LICENSE,sha256=p2c8S8i-8YqMpZCJnadLz1-ofxnRMILzz6NCMIypRag,1084
97
- ivoryos-1.2.6.dist-info/METADATA,sha256=Jf99DEqSEM-hGlQyIxilU021FEsX8W3Ztj_s6IHN1q0,7351
98
- ivoryos-1.2.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
99
- ivoryos-1.2.6.dist-info/top_level.txt,sha256=FRIWWdiEvRKqw-XfF_UK3XV0CrnNb6EmVbEgjaVazRM,8
100
- ivoryos-1.2.6.dist-info/RECORD,,
96
+ ivoryos-1.2.7.dist-info/licenses/LICENSE,sha256=p2c8S8i-8YqMpZCJnadLz1-ofxnRMILzz6NCMIypRag,1084
97
+ ivoryos-1.2.7.dist-info/METADATA,sha256=EEA3X0SiKMnSGTiZ-Q5_4A6LsofsYSVdKE7L2o4eZhE,7351
98
+ ivoryos-1.2.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
99
+ ivoryos-1.2.7.dist-info/top_level.txt,sha256=FRIWWdiEvRKqw-XfF_UK3XV0CrnNb6EmVbEgjaVazRM,8
100
+ ivoryos-1.2.7.dist-info/RECORD,,