linkml 1.7.9__py3-none-any.whl → 1.7.10__py3-none-any.whl

linkml/generators/pydanticgen/pydanticgen.py

@@ -723,7 +723,7 @@ Available templates to override:
 @click.option(
     "--pydantic-version",
     type=click.IntRange(1, 2),
-    default=1,
+    default=int(PYDANTIC_VERSION[0]),
     help="Pydantic version to use (1 or 2)",
 )
 @click.option(
@@ -750,7 +750,7 @@ def cli(
     classvars=True,
     slots=True,
     array_representations=list("list"),
-    pydantic_version=1,
+    pydantic_version=int(PYDANTIC_VERSION[0]),
     extra_fields: Literal["allow", "forbid", "ignore"] = "forbid",
     **args,
 ):

linkml/generators/shaclgen.py

@@ -130,7 +130,7 @@ class ShaclGenerator(Generator):
 
                             self._add_class(cl_node_pv, r)
                             range_list.append(class_node)
-                        elif r in sv.all_types().values():
+                        elif r in sv.all_types():
                             t_node = BNode()
 
                             def t_node_pv(p, v):
@@ -168,7 +168,7 @@ class ShaclGenerator(Generator):
                             prop_pv(SH.nodeKind, SH.IRI)
                         else:
                             prop_pv(SH.nodeKind, SH.BlankNodeOrIRI)
-                    elif r in sv.all_types().values():
+                    elif r in sv.all_types():
                         self._add_type(prop_pv, r)
                     elif r in sv.all_enums():
                         self._add_enum(g, prop_pv, r)
@@ -201,10 +201,11 @@ class ShaclGenerator(Generator):
         func(SH["in"], pv_node)
 
     def _add_type(self, func: Callable, r: ElementName) -> None:
+        func(SH.nodeKind, SH.Literal)
         sv = self.schemaview
         rt = sv.get_type(r)
         if rt.uri:
-            func(SH.datatype, rt.uri)
+            func(SH.datatype, URIRef(sv.get_uri(rt, expand=True)))
         else:
             logging.error(f"No URI for type {rt.name}")
 

{linkml-1.7.9.dist-info → linkml-1.7.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: linkml
-Version: 1.7.9
+Version: 1.7.10
 Summary: Linked Open Data Modeling Language
 Home-page: https://linkml.io/linkml/
 Keywords: schema,linked data,data modeling,rdf,owl,biolink

{linkml-1.7.9.dist-info → linkml-1.7.10.dist-info}/RECORD

@@ -43,7 +43,7 @@ linkml/generators/pydanticgen/__init__.py,sha256=uKGaaQSaeKqinHImXGFE448i-t8Oi0N
 linkml/generators/pydanticgen/array.py,sha256=1QWWgz46yVmWkdNauI6Kjkbx3kexp-l210nOILoHJ18,19506
 linkml/generators/pydanticgen/black.py,sha256=c-Hgaao9hd4nPMU9w0Hmg2j4Wc81IcY0zAfppQPr1cM,721
 linkml/generators/pydanticgen/build.py,sha256=Ia8qy4C16b-KqO_fw4tGQW_Eo4grCVyX7RsuJ3uRTtk,2681
-linkml/generators/pydanticgen/pydanticgen.py,sha256=RHRMRXPpR4tFoUcKM3S58NbU1VI6uXtcZ0wh6zzNZRg,30138
+linkml/generators/pydanticgen/pydanticgen.py,sha256=7X56SDTEzWt8irqdWOmYUfiBcAlOlfRUbTK3JhYX_JU,30184
 linkml/generators/pydanticgen/template.py,sha256=fAqRofLm7N94xUqXjkStdmugcxGQfiioGkxdIhLByik,19990
 linkml/generators/pydanticgen/templates/attribute.py.jinja,sha256=AlH_QFJJkONpzXQRGqnW4ufmjp9s9E7Q9W5r8ykNGeQ,443
 linkml/generators/pydanticgen/templates/base_model.py.jinja,sha256=48y64MnC9rjNSV-nKLMeDuHN4gm15UsInhnKxh65zoM,834
@@ -59,7 +59,7 @@ linkml/generators/rdfgen.py,sha256=eQi3XXjWk6xliTLncQ4G0VYzGCJwCU_FFG-O7tA8DSA,2
 linkml/generators/shacl/__init__.py,sha256=O-M-wndKw8rMW-U8X3QCNHal-ErXP6uXZqxiQSa77l4,108
 linkml/generators/shacl/ifabsent_processor.py,sha256=kV9BGA2ZPXLRfaFuW0o4jpkATvGggvrqpAo9c1UqWNE,2193
 linkml/generators/shacl/shacl_data_type.py,sha256=BT3C9tdFyBQnuucPN7YQiFAKEa9yuzy-Q26X6dmOXgo,1827
-linkml/generators/shaclgen.py,sha256=unhdoNDe9Tp66oGj3LnRud6emN14jtaf2jtuVtxQ2NM,8800
+linkml/generators/shaclgen.py,sha256=B9BkCzOQULjpCN10jbvazY6_WEkeVGO8lxEhr6pQ3_A,8849
 linkml/generators/shexgen.py,sha256=MhB1HidCREMCJcDGBqutFQ0gWKKz7aSVw-0s-IHUMm4,9930
 linkml/generators/sparqlgen.py,sha256=c7x8GFChKWprBx4rToSnu9qN8OleWTCenVUdZ8XSTWM,6138
 linkml/generators/sqlalchemy/__init__.py,sha256=mb9AC1rIFkSiNZhhG0TAk45ol9PjS1XvsrvCjgfVUpQ,249
@@ -142,8 +142,8 @@ linkml/workspaces/datamodel/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 linkml/workspaces/datamodel/workspaces.py,sha256=4HdkqweGNfMPqnB1_Onc9DcTfkhoagTRcqruh08nRoI,14905
 linkml/workspaces/datamodel/workspaces.yaml,sha256=EjVrwPpeRZqJRjuGyyDRxxFzuv55SiLIXPBRUG6HStU,4233
 linkml/workspaces/example_runner.py,sha256=hDk2RGxRE5-WYNriWknugtbm3Mhn8bFcAcXGMlkYxVk,11705
-linkml-1.7.9.dist-info/LICENSE,sha256=kORMoywK6j9_iy0UvLR-a80P1Rvc9AOM4gsKlUNZABg,535
-linkml-1.7.9.dist-info/METADATA,sha256=BMYy_g5uDJO5NGDlD8Xvdl_uGqFBFwMuys3T_NGc7og,3724
-linkml-1.7.9.dist-info/entry_points.txt,sha256=7haDkIbyC7ZLhm5z-e3BhrLJpY2xoW1yuD8Y7QPNtVg,2093
-linkml-1.7.9.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-linkml-1.7.9.dist-info/RECORD,,
+linkml-1.7.10.dist-info/LICENSE,sha256=kORMoywK6j9_iy0UvLR-a80P1Rvc9AOM4gsKlUNZABg,535
+linkml-1.7.10.dist-info/METADATA,sha256=yPm-MeDgZDVgX_q3NF46RfunUoxWV2Mc5W6-ZkE6x_Y,3725
+linkml-1.7.10.dist-info/entry_points.txt,sha256=7haDkIbyC7ZLhm5z-e3BhrLJpY2xoW1yuD8Y7QPNtVg,2093
+linkml-1.7.10.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+linkml-1.7.10.dist-info/RECORD,,