linkml 1.9.5rc1__py3-none-any.whl → 1.9.5rc2__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.
Files changed (29) hide show
  1. linkml/cli/main.py +1 -1
  2. linkml/converter/__init__.py +0 -0
  3. linkml/generators/owlgen.py +9 -1
  4. linkml/generators/rustgen/build.py +3 -0
  5. linkml/generators/rustgen/cli.py +19 -1
  6. linkml/generators/rustgen/rustgen.py +169 -21
  7. linkml/generators/rustgen/template.py +51 -6
  8. linkml/generators/rustgen/templates/Cargo.toml.jinja +2 -2
  9. linkml/generators/rustgen/templates/anything.rs.jinja +8 -1
  10. linkml/generators/rustgen/templates/as_key_value.rs.jinja +33 -3
  11. linkml/generators/rustgen/templates/enum.rs.jinja +16 -0
  12. linkml/generators/rustgen/templates/file.rs.jinja +13 -0
  13. linkml/generators/rustgen/templates/lib_shim.rs.jinja +52 -0
  14. linkml/generators/rustgen/templates/poly_trait_property_impl.rs.jinja +3 -1
  15. linkml/generators/rustgen/templates/property.rs.jinja +12 -3
  16. linkml/generators/rustgen/templates/serde_utils.rs.jinja +186 -6
  17. linkml/generators/rustgen/templates/slot_range_as_union.rs.jinja +3 -0
  18. linkml/generators/rustgen/templates/struct.rs.jinja +6 -0
  19. linkml/generators/rustgen/templates/struct_or_subtype_enum.rs.jinja +4 -1
  20. linkml/generators/rustgen/templates/stub_gen.rs.jinja +71 -0
  21. linkml/generators/rustgen/templates/stub_utils.rs.jinja +76 -0
  22. linkml/generators/yarrrmlgen.py +20 -4
  23. linkml/utils/schema_builder.py +2 -0
  24. {linkml-1.9.5rc1.dist-info → linkml-1.9.5rc2.dist-info}/METADATA +1 -1
  25. {linkml-1.9.5rc1.dist-info → linkml-1.9.5rc2.dist-info}/RECORD +29 -25
  26. {linkml-1.9.5rc1.dist-info → linkml-1.9.5rc2.dist-info}/entry_points.txt +1 -1
  27. /linkml/{utils/converter.py → converter/cli.py} +0 -0
  28. {linkml-1.9.5rc1.dist-info → linkml-1.9.5rc2.dist-info}/WHEEL +0 -0
  29. {linkml-1.9.5rc1.dist-info → linkml-1.9.5rc2.dist-info}/licenses/LICENSE +0 -0
@@ -193,6 +193,8 @@ class SchemaBuilder:
193
193
  if isinstance(pv, str):
194
194
  pv = PermissibleValue(text=pv)
195
195
  enum_def.permissible_values[pv.text] = pv
196
+ else:
197
+ enum_def.permissible_values[pv.text] = pv
196
198
  return self
197
199
 
198
200
  def add_prefix(self, prefix: str, url: str, replace_if_present=False) -> "SchemaBuilder":
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: linkml
3
- Version: 1.9.5rc1
3
+ Version: 1.9.5rc2
4
4
  Summary: Linked Open Data Modeling Language
5
5
  Author: Deepak Unni
6
6
  Author-email: Chris Mungall <cjmungall@lbl.gov>, Sierra Moxon <smoxon@lbl.gov>, Harold Solbrig <solbrig@jhu.edu>, Sujay Patil <spatil@lbl.gov>, Harshad Hegde <hhegde@lbl.gov>, Mark Andrew Miller <MAM@lbl.gov>, Gaurav Vaidya <gaurav@renci.org>, Kevin Schaper <kevin@tislab.org>
@@ -3,7 +3,9 @@ linkml/_version.py,sha256=udxv6OEqcE89DTVMYPtetXYg8IA8Sgc6yW26-6f8C3M,310
3
3
  linkml/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
4
4
  linkml/cli/__main__.py,sha256=oPa7Fl2DQP40UivpIWNRr1CgwT2SQM0rhE478155zBY,80
5
5
  linkml/cli/logging.py,sha256=MdVbox1qr6kDUHUCWAmFhV-D6ebs_nn8vVwB8KDQfew,742
6
- linkml/cli/main.py,sha256=mFbLc6s5Z5CdXL6Gnsvr8F3rPehG4sqS5AXLwJezDTs,5806
6
+ linkml/cli/main.py,sha256=IyLP0yZV4J51rhmw9wdX_4XNKehYlk3L3sBvwv02pXk,5804
7
+ linkml/converter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
8
+ linkml/converter/cli.py,sha256=0xcUXdVPUXZvVuHivUibfVMoCd24oPsjYU1M17H173U,7121
7
9
  linkml/generators/PythonGenNotes.md,sha256=SOzZhIBP_O8g46uBTnYy6A7nuP--hh-f_QXEERZRxdk,50822
8
10
  linkml/generators/README.md,sha256=fnkmT98lspv8a8FyBLOQsHoBKQaapFGb8H_Stg56dco,4436
9
11
  linkml/generators/__init__.py,sha256=DGSaQ3JOAjI1VwjZQXmU6IPZdAfoBC2ma-N4aRgvGKY,1742
@@ -25,7 +27,7 @@ linkml/generators/markdowngen.py,sha256=_4RfmuMNR-m90QdmbG26iFQC_ZSaUBDUWPX_hsqZ
25
27
  linkml/generators/mermaidclassdiagramgen.py,sha256=Zr926xS1K2MqD3K3x9zb9w_ot1T0wyj9U_1ZHZTN2n4,5984
26
28
  linkml/generators/namespacegen.py,sha256=C4p9LSwsnDqf6sv-wG5l0VQniWFJ1HA1hRXJBDOg3pM,6467
27
29
  linkml/generators/oocodegen.py,sha256=dgcHhpO81qC2Tx-kG_VhZVaoRjOwrcrulIXV8gEU1bY,7808
28
- linkml/generators/owlgen.py,sha256=cd7kvspyldP21PxJzLGStWkcqknJ9X-mQk2mfOQFC9Q,58203
30
+ linkml/generators/owlgen.py,sha256=-eCqd0QF_3k0sT6Qjl-uSVGpEGOYtip8wQEfZeovUNo,58581
29
31
  linkml/generators/plantumlgen.py,sha256=KUmx25wCcUJrnaOqXJ3EyCx12f9YK2wlrWGOFifKcJc,16053
30
32
  linkml/generators/prefixmapgen.py,sha256=X-3K1q5WcSS8TL7rHBOL4qBGBk2Szr7l1_UzRQVvFGA,4246
31
33
  linkml/generators/projectgen.py,sha256=qvXIWDfrPYKZT38JCyItQjW1AZofJ4ZyPZeUkscZxOo,9586
@@ -43,7 +45,7 @@ linkml/generators/summarygen.py,sha256=abNd39Z-Kn3FX2fjXLeCqvXvFunpqM7UFPimtiCB2
43
45
  linkml/generators/terminusdbgen.py,sha256=Zizvh_GLBO9LK_X11gUvB_Ip1ttkkfiD4OZBtxjgAG4,4669
44
46
  linkml/generators/typescriptgen.py,sha256=wRnZpZ3LEepJRFYHVNP06PX5rPFzIDPglDRxi0Z6Zro,8870
45
47
  linkml/generators/yamlgen.py,sha256=PWexYoR3wHRoAUk6zK67fRYjBF6sAmX_iGlOAT0PJq0,1623
46
- linkml/generators/yarrrmlgen.py,sha256=-wi-jozAkGk1OsrsF-wDy23dYwV7W_6K7J-6HO9c7Ds,5257
48
+ linkml/generators/yarrrmlgen.py,sha256=jEQo6k_w_S3HeYoMm0C5lDDqrXaB_ZMADSJ1i35KCww,5865
47
49
  linkml/generators/yumlgen.py,sha256=ZK42N3hJPvvOdztOWCwysARrGVWjg5V4Qx2XcS2Vvgc,13277
48
50
  linkml/generators/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
49
51
  linkml/generators/common/build.py,sha256=3SxiwOp9bzrt9XVQqgegstGEuiibnG0-4gdlIAiRBtE,2394
@@ -104,32 +106,35 @@ linkml/generators/pydanticgen/templates/validator.py.jinja,sha256=oz8XWh4Mt7DRHH
104
106
  linkml/generators/python/__init__.py,sha256=NS9fPEuAo0punDplD91F9mcViXMJJv04Q5NkFcKPNvY,40
105
107
  linkml/generators/python/python_ifabsent_processor.py,sha256=AqFabuyHCBpPTLO2-XO1uWNh3YcIpc-Na_649o_VmLc,3834
106
108
  linkml/generators/rustgen/__init__.py,sha256=2ihCJiuI3AxYo55Sqt4r2wVxn-3Kp6RNgQVQ-SNvaQU,115
107
- linkml/generators/rustgen/build.py,sha256=-TfjBYFdJWBSCGMMmQKQ9RvC7_rJoTWXwc7NIMdxhaA,1777
108
- linkml/generators/rustgen/cli.py,sha256=PcMFzi110RZreERjiW2db89aXsk1hMZ6gzdV7eZdrpY,1898
109
- linkml/generators/rustgen/rustgen.py,sha256=Wbgqhdhs-jlcp0C5y3NlJamC5aCBdmPQYdOxdEUBnpA,39682
110
- linkml/generators/rustgen/template.py,sha256=6rJh84jmWxLGThR9V3w9gEq0n7PTFZKkWnKY3nlkwTw,27995
111
- linkml/generators/rustgen/templates/Cargo.toml.jinja,sha256=ogwEnMlx6Rl81DKiyt9AF67y7aBjXpy4dxCrLi8Fwzw,1057
112
- linkml/generators/rustgen/templates/anything.rs.jinja,sha256=2RKNeqCawcMzSPgrOSx2yB8F7R9OqzXH3VDOhA2BqSU,5095
113
- linkml/generators/rustgen/templates/as_key_value.rs.jinja,sha256=_vm6HIFssQCSIbI391Z5eLtzLdbkCRqgTkI-8oH2rqI,2161
109
+ linkml/generators/rustgen/build.py,sha256=vBMcCsDjDM56BzSHFGy0S0Ugv5PusSVBfIWa3chTlbI,1879
110
+ linkml/generators/rustgen/cli.py,sha256=GEQmwxx_yZNcVRA0eUao7Qxgdp8o8NU5GhHq59SQhjQ,2349
111
+ linkml/generators/rustgen/rustgen.py,sha256=OyURn_vvk7OXkG5ivNSBzpMiKJKTIZgGoVdI5bwOEgo,45751
112
+ linkml/generators/rustgen/template.py,sha256=D412jQwfLQy79Z-_jSUUBh6_erTNh95eW4-v7-ed25E,29482
113
+ linkml/generators/rustgen/templates/Cargo.toml.jinja,sha256=CqHM6DkVLpk9YUD4FJmt4LJLwkEjzGsyUTd1TIAkFqw,1061
114
+ linkml/generators/rustgen/templates/anything.rs.jinja,sha256=WWAO9QkS0kKWkPcW5M6-58X8lyuDpuMpsz_1TEid5ss,5246
115
+ linkml/generators/rustgen/templates/as_key_value.rs.jinja,sha256=dOAWwUy4Ce6jZ-6Uj3cwCGo1-hBdSBsU1eEhUoIHfd8,3181
114
116
  linkml/generators/rustgen/templates/class_module.rs.jinja,sha256=HKRA6L74rGLynfvxdLhzuVQK-5s7tWlcpUmUr1NSw5Q,153
115
- linkml/generators/rustgen/templates/enum.rs.jinja,sha256=7xmTDezReZEflgBJiY_nxJwSfD5pJfJUPtopAvJbEa4,1807
116
- linkml/generators/rustgen/templates/file.rs.jinja,sha256=8fuoqOZM4joBoOHdk1FvIkTbhh4v6cPRLBZVzRZypQI,1007
117
+ linkml/generators/rustgen/templates/enum.rs.jinja,sha256=YiBvQvjkIKGNv-mtAMCENf7gdM78-d2qOV5uBJXA7Rs,2395
118
+ linkml/generators/rustgen/templates/file.rs.jinja,sha256=UCrDJuZu3q8IX8TW7qhBVmmillJ04iFdQ5XzCSjVGI0,1297
117
119
  linkml/generators/rustgen/templates/import.rs.jinja,sha256=fYEG5YYVszjBVp6Gs-pJdgcAoaiHghUQxUg2BA4yyx8,397
118
120
  linkml/generators/rustgen/templates/imports.rs.jinja,sha256=2u0cVLBrluxldVnEUJ1ipMJWQGrWidmDP6KbJVyQxi8,158
121
+ linkml/generators/rustgen/templates/lib_shim.rs.jinja,sha256=zY7Cje4tOs7hEPuur5U5BMo8Jc2z4BPDYG2JgFpv__k,1681
119
122
  linkml/generators/rustgen/templates/poly.rs.jinja,sha256=CXFmKfNwZMSI2cYXy14vKzv80QGtO86vjTdTf7NZi0U,123
120
123
  linkml/generators/rustgen/templates/poly_containers.rs.jinja,sha256=xDZevupLBm0bLjltXc1VzE1tVyAligeOtRZmN6-_puw,12347
121
124
  linkml/generators/rustgen/templates/poly_trait.rs.jinja,sha256=Smje9PjD2LZsZ27XVbCcHJeWDU5e1PyNg-zJOAVhf9U,308
122
125
  linkml/generators/rustgen/templates/poly_trait_impl.rs.jinja,sha256=u1_DSCB-7vX05_xL34gmIQHKelnexGCQZp_lAXhShyw,95
123
126
  linkml/generators/rustgen/templates/poly_trait_impl_orsubtype.rs.jinja,sha256=4GTCjV_1MlUG5O-gN_SD-4UY3RaLvthIYW24sLhXGBs,93
124
127
  linkml/generators/rustgen/templates/poly_trait_property.rs.jinja,sha256=tLge1ghiR6lHPUsHDhXIQHPshK7hGkJtXm8hXSiL4-g,428
125
- linkml/generators/rustgen/templates/poly_trait_property_impl.rs.jinja,sha256=DTloJkCwXgqmHrat6XRLO9iY6KFX-yOwVMTp_TQNcEY,5112
128
+ linkml/generators/rustgen/templates/poly_trait_property_impl.rs.jinja,sha256=IwJB6vy0ShZgyNvdMo4WUcPmns7qh9gKbDbHfB6KqmU,5196
126
129
  linkml/generators/rustgen/templates/poly_trait_property_match.rs.jinja,sha256=qEeKXt1AcEoIpDrbaNkOgyfGs1zgxGtn8SyHo6mgCWA,478
127
- linkml/generators/rustgen/templates/property.rs.jinja,sha256=SatpHKIyEOOvAWZOpQ3IRWsNfuBrxc7SPkrVzLIVulI,1014
130
+ linkml/generators/rustgen/templates/property.rs.jinja,sha256=7GRXNwEPi1jLttOI27jldcK3H3-tPUVLqvpFr4O_ST4,1350
128
131
  linkml/generators/rustgen/templates/pyproject.toml.jinja,sha256=4ViLLeTcLt9wzqe8i80HEypHiU5lGwfzU6IHqzzc1cw,184
129
- linkml/generators/rustgen/templates/serde_utils.rs.jinja,sha256=KfeDiNZOFfkR2bVlDDmXvR-n58dGazitjBTb5tgVQyA,9441
130
- linkml/generators/rustgen/templates/slot_range_as_union.rs.jinja,sha256=qFoAWJLUoZbnm9-weg5BJn5Z3iylEK6ELolhjPy5qUQ,2112
131
- linkml/generators/rustgen/templates/struct.rs.jinja,sha256=AkBF34s054XH_VqUQe61YwdFt_coWrQTECNapoVySK4,2215
132
- linkml/generators/rustgen/templates/struct_or_subtype_enum.rs.jinja,sha256=333LZUcpjHPsA2aR3Ts1pNnlncMH0ubmA5HlajWFW20,3427
132
+ linkml/generators/rustgen/templates/serde_utils.rs.jinja,sha256=PDx0VLooA0sjKGBf_XNxHmiEobGdQMmgW7ew6-Gf5Po,13884
133
+ linkml/generators/rustgen/templates/slot_range_as_union.rs.jinja,sha256=qYeOvojeoPUkUPiRhnX-nurwBfjkIMIeHkIUzEYHu3E,2235
134
+ linkml/generators/rustgen/templates/struct.rs.jinja,sha256=45vGkG8R5OgUVyUWnF40D0sym0FjP46XIDnyzpUItqc,2377
135
+ linkml/generators/rustgen/templates/struct_or_subtype_enum.rs.jinja,sha256=Jpix-C9Hcycg8gyuF_ghHyZAQBH_yKJjpB6P74Yh1mM,3559
136
+ linkml/generators/rustgen/templates/stub_gen.rs.jinja,sha256=3xiRepFCr1vrDUne_4if3Tzil9B4l5lV0x9RRRZeOkU,2093
137
+ linkml/generators/rustgen/templates/stub_utils.rs.jinja,sha256=_FAVspupgJwpdbiSLjvZG0MY6PK5pf-1HibUrTiEf4w,2818
133
138
  linkml/generators/rustgen/templates/typealias.rs.jinja,sha256=HQtLzULc-7YaqfVfecYUJBqX7k3PCMEyU9Q8h5-a5vc,413
134
139
  linkml/generators/shacl/__init__.py,sha256=KgMOyESGTdKk2Vhx9uuUYgEJPuJQ-iT1vDQVIMoiXCM,58
135
140
  linkml/generators/shacl/shacl_data_type.py,sha256=gX3Y2KyTVPwMyef0cJMTEpU9h0oH-H0ThVDORdNW170,1828
@@ -162,7 +167,6 @@ linkml/transformers/relmodel_transformer.py,sha256=g3WhT3FyNlxP36lFaJzSh9v9eZweN
162
167
  linkml/transformers/rollup_transformer.py,sha256=YP3RyYa0TzfkTrPZ4LnTIedmQWCnneFk3wAT77E1Amc,4549
163
168
  linkml/transformers/schema_renamer.py,sha256=DvXsAsxAb8p8RAxR_c74zbn_VRFN1JHCLHcjH9z7qr0,5263
164
169
  linkml/utils/__init__.py,sha256=Pkyv-Gfb8QoJdInRdJuuUz1Igfe0sT9t8Gv3V_fyTXc,92
165
- linkml/utils/converter.py,sha256=0xcUXdVPUXZvVuHivUibfVMoCd24oPsjYU1M17H173U,7121
166
170
  linkml/utils/datautils.py,sha256=QlbzwXykh5Fphfe5KxPo6_ekXfniLbHiEGJtLWjUrvY,3742
167
171
  linkml/utils/datavalidator.py,sha256=kBdWaVi8IZT1bOwEJgJYx-wZAb_PTBObB9nHpYORfKA,472
168
172
  linkml/utils/deprecation.py,sha256=fFd_rUmTJInovuhuHVZf_44fQRve6FyJ43DY2-0XLmA,9781
@@ -173,7 +177,7 @@ linkml/utils/helpers.py,sha256=MomYM4Oof-c1SgyMpjoG0Aob-eaVeF8kXvuzdJiKo_g,3351
173
177
  linkml/utils/logictools.py,sha256=dvwuX6DU0PZyxhVr9kphyQFttqZNSbbIRZ7vtTh2gU8,23649
174
178
  linkml/utils/mergeutils.py,sha256=uXHuyc13MhATMPaDToSsJlMTXeqQ9AGVEj7uOlcGGLE,10505
175
179
  linkml/utils/rawloader.py,sha256=nUB8Gfn8yEVwyo6bx0TtB2mBGkilC-fybi0xvQ73Gks,4417
176
- linkml/utils/schema_builder.py,sha256=WfTdRnuLUhNj_y_D1uaMCaGXgafUuJkvMyPlW8T11r8,9971
180
+ linkml/utils/schema_builder.py,sha256=dowMWyuo00yjfh0BHCmPiEw12o0tEmj3lXiKVp_VpBU,10055
177
181
  linkml/utils/schema_fixer.py,sha256=j9MoPlAd6j8fLC1Mnj_MSojnPlfR_Ml87jQkknjPYjE,16754
178
182
  linkml/utils/schemaloader.py,sha256=DlsKEOvo_uIaQL_Rlz4yCPCc_uStOlFYUVcQbqF4Vik,50590
179
183
  linkml/utils/schemasynopsis.py,sha256=0cJZHTIrXTUS6EPvK2YKo7IuvbRQCkWKeRBsyz_zjSo,18441
@@ -205,8 +209,8 @@ linkml/workspaces/example_runner.py,sha256=EjaAn6vaAKZnFcW5hRopkYBguiaR05aqKbuaM
205
209
  linkml/workspaces/datamodel/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
206
210
  linkml/workspaces/datamodel/workspaces.py,sha256=YIGzErECZuMER03h3DcuY3psMb0lDF1Pia_8hreKoTE,14667
207
211
  linkml/workspaces/datamodel/workspaces.yaml,sha256=LU0lMJ4W6Tk66r5ECD7OkaVm9kCRfu93yoik1b4gkzQ,4228
208
- linkml-1.9.5rc1.dist-info/METADATA,sha256=sUm26BPUFhoVUtTnyxcISJ09MKQODVDkPxNxn_kWU8k,3344
209
- linkml-1.9.5rc1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
210
- linkml-1.9.5rc1.dist-info/entry_points.txt,sha256=4JoXSZFx4-Hl3OT0b_M9aQIBr2f3untnPuBzY6TSZ_c,2381
211
- linkml-1.9.5rc1.dist-info/licenses/LICENSE,sha256=zsURghk1UIVsx0jaDvEy5QU2UAqecv1vtJozTV8Hwvw,536
212
- linkml-1.9.5rc1.dist-info/RECORD,,
212
+ linkml-1.9.5rc2.dist-info/METADATA,sha256=DayQ7eD8J_fO-huw1xxfQFqKa4d45oSMqR2Lx8QlfKY,3344
213
+ linkml-1.9.5rc2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
214
+ linkml-1.9.5rc2.dist-info/entry_points.txt,sha256=pxiXrMMc21vHnzIgIUCLNJPySyKeD8rLocgPc2lFOWs,2379
215
+ linkml-1.9.5rc2.dist-info/licenses/LICENSE,sha256=zsURghk1UIVsx0jaDvEy5QU2UAqecv1vtJozTV8Hwvw,536
216
+ linkml-1.9.5rc2.dist-info/RECORD,,
@@ -40,7 +40,7 @@ gen-typescript = linkml.generators.typescriptgen:cli
40
40
  gen-yaml = linkml.generators.yamlgen:cli
41
41
  gen-yuml = linkml.generators.yumlgen:cli
42
42
  linkml = linkml.cli.main:linkml
43
- linkml-convert = linkml.utils.converter:cli
43
+ linkml-convert = linkml.converter.cli:cli
44
44
  linkml-jsonschema-validate = linkml.validators.jsonschemavalidator:cli
45
45
  linkml-lint = linkml.linter.cli:main
46
46
  linkml-run-examples = linkml.workspaces.example_runner:cli
File without changes