linkml 1.8.1__py3-none-any.whl → 1.8.2__py3-none-any.whl

linkml/generators/pydanticgen/template.py

@@ -1,11 +1,13 @@
-from copy import copy
 from importlib.util import find_spec
-from typing import Any, ClassVar, Dict, Generator, List, Literal, Optional, Union, overload
+from typing import Any, ClassVar, Dict, Generator, List, Literal, Optional, Union
 
 from jinja2 import Environment, PackageLoader
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 from pydantic.version import VERSION as PYDANTIC_VERSION
 
+from linkml.generators.common.template import TemplateModel
+from linkml.utils.deprecation import deprecation_warning
+
 try:
     if find_spec("black") is not None:
         from linkml.generators.pydanticgen.black import format_black
@@ -19,10 +21,14 @@ except ImportError:
 if int(PYDANTIC_VERSION[0]) >= 2:
     from pydantic import computed_field
 else:
-    from pydantic.fields import ModelField
+    deprecation_warning("pydantic-v1")
+
+    def computed_field(f):
+        """No-op decorator to allow this module to not break imports until 1.9.0"""
+        return f
 
 
-class TemplateModel(BaseModel):
+class PydanticTemplateModel(TemplateModel):
     """
     Metaclass to render pydantic models with jinja templates.
 
@@ -59,15 +65,14 @@ class TemplateModel(BaseModel):
         loader=PackageLoader("linkml.generators.pydanticgen", "templates"), trim_blocks=True, lstrip_blocks=True
     )
 
-    pydantic_ver: int = int(PYDANTIC_VERSION[0])
     meta_exclude: ClassVar[List[str]] = None
 
     def render(self, environment: Optional[Environment] = None, black: bool = False) -> str:
         """
         Recursively render a template model to a string.
 
-        For each field in the model, recurse through, rendering each :class:`.TemplateModel`
-        using the template set in :attr:`.TemplateModel.template` , but preserving the structure
+        For each field in the model, recurse through, rendering each :class:`.PydanticTemplateModel`
+        using the template set in :attr:`.PydanticTemplateModel.template` , but preserving the structure
         of lists and dictionaries. Regular :class:`.BaseModel` s are rendered to dictionaries.
         Any other value is passed through unchanged.
 
@@ -76,16 +81,10 @@ class TemplateModel(BaseModel):
             black (bool): if ``True`` , format template with black. (default False)
         """
         if environment is None:
-            environment = TemplateModel.environment()
+            environment = self.environment()
 
-        if int(PYDANTIC_VERSION[0]) >= 2:
-            fields = {**self.model_fields, **self.model_computed_fields}
-        else:
-            fields = self.model_fields
+        rendered = super().render(environment=environment)
 
-        data = {k: _render(getattr(self, k, None), environment) for k in fields}
-        template = environment.get_template(self.template)
-        rendered = template.render(**data)
         if format_black is not None and black:
             try:
                 return format_black(rendered)
@@ -97,72 +96,6 @@ class TemplateModel(BaseModel):
         else:
             return rendered
 
-    @classmethod
-    def environment(cls) -> Environment:
-        """
-        Default environment for Template models.
-        uses a :class:`jinja2.PackageLoader` for the templates directory within this module
-        with the ``trim_blocks`` and ``lstrip_blocks`` parameters set to ``True`` so that the
-        default templates could be written in a more readable way.
-        """
-        return copy(cls._environment)
-
-    if int(PYDANTIC_VERSION[0]) < 2:
-        # simulate pydantic 2's model_fields behavior
-        # without using classmethod + property decorators
-        # see:
-        # - https://docs.python.org/3/whatsnew/3.11.html#language-builtins
-        # - https://github.com/python/cpython/issues/89519
-        # and:
-        # - https://docs.python.org/3/reference/datamodel.html#customizing-class-creation
-        # for this version.
-        model_fields: ClassVar[Dict[str, "ModelField"]]
-
-        def __init_subclass__(cls, **kwargs):
-            super().__init_subclass__(**kwargs)
-            cls.model_fields = cls.__fields__
-
-        @overload
-        def model_dump(self, mode: Literal["python"] = "python") -> dict: ...
-
-        @overload
-        def model_dump(self, mode: Literal["json"] = "json") -> str: ...
-
-        def model_dump(self, mode: Literal["python", "json"] = "python", **kwargs) -> Union[dict, str]:
-            if mode == "json":
-                return self.json(**kwargs)
-            return self.dict(**kwargs)
-
-    @classmethod
-    def exclude_from_meta(cls: "TemplateModel") -> List[str]:
-        """
-        Attributes in the source definition to exclude from linkml_meta
-        """
-        ret = [*cls.model_fields.keys()]
-        if cls.meta_exclude is not None:
-            ret = ret + cls.meta_exclude
-        return ret
-
-
-def _render(
-    item: Union[TemplateModel, Any, List[Union[Any, TemplateModel]], Dict[str, Union[Any, TemplateModel]]],
-    environment: Environment,
-) -> Union[str, List[str], Dict[str, str]]:
-    if isinstance(item, TemplateModel):
-        return item.render(environment)
-    elif isinstance(item, list):
-        return [_render(i, environment) for i in item]
-    elif isinstance(item, dict):
-        return {k: _render(v, environment) for k, v in item.items()}
-    elif isinstance(item, BaseModel):
-        if int(PYDANTIC_VERSION[0]) >= 2:
-            fields = item.model_fields
-        else:
-            fields = item.__fields__
-        return {k: _render(getattr(item, k, None), environment) for k in fields.keys()}
-    else:
-        return item
-
 
 class EnumValue(BaseModel):
     """
@@ -174,7 +107,7 @@ class EnumValue(BaseModel):
     description: Optional[str] = None
 
 
-class PydanticEnum(TemplateModel):
+class PydanticEnum(PydanticTemplateModel):
     """
     Model used to render a :class:`enum.Enum`
     """
@@ -186,7 +119,7 @@ class PydanticEnum(TemplateModel):
     values: Dict[str, EnumValue] = Field(default_factory=dict)
 
 
-class PydanticBaseModel(TemplateModel):
+class PydanticBaseModel(PydanticTemplateModel):
     """
     Parameterization of the base model that generated pydantic classes inherit from
     """
@@ -207,24 +140,24 @@ class PydanticBaseModel(TemplateModel):
     strict: bool = False
     """
     Enable strict mode in the base model.
-    
+
     .. note::
-    
+
         Pydantic 2 only! Pydantic 1 only has strict types, not strict mode. See: https://github.com/linkml/linkml/issues/1955
-    
+
     References:
         https://docs.pydantic.dev/latest/concepts/strict_mode
     """
 
 
-class PydanticAttribute(TemplateModel):
+class PydanticAttribute(PydanticTemplateModel):
     """
     Reduced version of SlotDefinition that carries all and only the information
     needed by the template
     """
 
     template: ClassVar[str] = "attribute.py.jinja"
-    meta_exclude: ClassVar[List[str]] = ["from_schema", "owner", "range", "multivalued", "inlined", "inlined_as_list"]
+    meta_exclude: ClassVar[List[str]] = ["from_schema", "owner", "range", "inlined", "inlined_as_list"]
 
     name: str
     required: bool = False
@@ -232,51 +165,32 @@ class PydanticAttribute(TemplateModel):
     key: bool = False
     predefined: Optional[str] = None
     """Fixed string to use in body of field"""
-    annotations: Optional[dict] = None
-    """
-    Of the form::
-
-        annotations = {'python_range': {'value': 'int'}}
-
-    .. todo::
-
-        simplify when refactoring pydanticgen, should just be a string or a model
-
-    """
+    range: Optional[str] = None
+    """Type annotation used for model field"""
     title: Optional[str] = None
     description: Optional[str] = None
     equals_number: Optional[Union[int, float]] = None
     minimum_value: Optional[Union[int, float]] = None
     maximum_value: Optional[Union[int, float]] = None
+    exact_cardinality: Optional[int] = None
+    minimum_cardinality: Optional[int] = None
+    maximum_cardinality: Optional[int] = None
+    multivalued: Optional[bool] = None
     pattern: Optional[str] = None
     meta: Optional[Dict[str, Any]] = None
     """
     Metadata for the slot to be included in a Field annotation
     """
 
-    if int(PYDANTIC_VERSION[0]) >= 2:
-
-        @computed_field
-        def field(self) -> str:
-            """Computed value to use inside of the generated Field"""
-            if self.predefined:
-                return self.predefined
-            elif self.required or self.identifier or self.key:
-                return "..."
-            else:
-                return "None"
-
-    else:
-        field: Optional[str] = None
-
-        def __init__(self, **kwargs):
-            super(PydanticAttribute, self).__init__(**kwargs)
-            if self.predefined:
-                self.field = self.predefined
-            elif self.required or self.identifier or self.key:
-                self.field = "..."
-            else:
-                self.field = "None"
+    @computed_field
+    def field(self) -> str:
+        """Computed value to use inside of the generated Field"""
+        if self.predefined:
+            return self.predefined
+        elif self.required or self.identifier or self.key:
+            return "..."
+        else:
+            return "None"
 
 
 class PydanticValidator(PydanticAttribute):
@@ -287,7 +201,7 @@ class PydanticValidator(PydanticAttribute):
     template: ClassVar[str] = "validator.py.jinja"
 
 
-class PydanticClass(TemplateModel):
+class PydanticClass(PydanticTemplateModel):
     """
     Reduced version of ClassDefinition that carries all and only the information
     needed by the template.
@@ -316,29 +230,14 @@ class PydanticClass(TemplateModel):
 
         return {k: PydanticValidator(**v.model_dump()) for k, v in self.attributes.items() if v.pattern is not None}
 
-    if int(PYDANTIC_VERSION[0]) >= 2:
+    @computed_field
+    def validators(self) -> Optional[Dict[str, PydanticValidator]]:
+        return self._validators()
 
-        @computed_field
-        def validators(self) -> Optional[Dict[str, PydanticValidator]]:
-            return self._validators()
-
-        @computed_field
-        def slots(self) -> Optional[Dict[str, PydanticAttribute]]:
-            """alias of attributes"""
-            return self.attributes
-
-    else:
-        validators: Optional[Dict[str, PydanticValidator]]
-
-        def __init__(self, **kwargs):
-            super(PydanticClass, self).__init__(**kwargs)
-            self.validators = self._validators()
-
-        def render(self, environment: Optional[Environment] = None, black: bool = False) -> str:
-            """Overridden in pydantic 1 to ensure that validators are regenerated at rendering time"""
-            # refresh in case attributes have changed since init
-            self.validators = self._validators()
-            return super(PydanticClass, self).render(environment, black)
+    @computed_field
+    def slots(self) -> Optional[Dict[str, PydanticAttribute]]:
+        """alias of attributes"""
+        return self.attributes
 
 
 class ObjectImport(BaseModel):
@@ -352,7 +251,7 @@ class ObjectImport(BaseModel):
     alias: Optional[str] = None
 
 
-class Import(TemplateModel):
+class Import(PydanticTemplateModel):
     """
     A python module, or module and classes to be imported.
 
@@ -386,6 +285,12 @@ class Import(TemplateModel):
     module: str
     alias: Optional[str] = None
     objects: Optional[List[ObjectImport]] = None
+    is_schema: bool = False
+    """
+    Whether or not this ``Import`` is importing another schema imported by the main schema --
+    ie. that it is not expected to be provided by the environment, but imported locally from within the package.
+    Used primarily in split schema generation, see :func:`.pydanticgen.generate_split` for example usage.
+    """
 
     def merge(self, other: "Import") -> List["Import"]:
         """
@@ -429,7 +334,14 @@ class Import(TemplateModel):
             }
             self_objs.update(other_objs)
 
-            return [Import(module=self.module, alias=alias, objects=list(self_objs.values()))]
+            return [
+                Import(
+                    module=self.module,
+                    alias=alias,
+                    objects=list(self_objs.values()),
+                    is_schema=self.is_schema or other.is_schema,
+                )
+            ]
         else:
             # one is a module, the other imports objects, keep both
             return [self, other]
@@ -480,7 +392,7 @@ class ConditionalImport(Import):
     alternative: Import
 
 
-class Imports(TemplateModel):
+class Imports(PydanticTemplateModel):
     """
     Container class for imports that can handle merging!
 
@@ -516,19 +428,38 @@ class Imports(TemplateModel):
 
     imports: List[Union[Import, ConditionalImport]] = Field(default_factory=list)
 
-    def __add__(self, other: Union[Import, "Imports", List[Import]]) -> "Imports":
+    @classmethod
+    def _merge(
+        cls, imports: List[Union[Import, ConditionalImport]], other: Union[Import, "Imports", List[Import]]
+    ) -> List[Union[Import, ConditionalImport]]:
+        """
+        Add a new import to an existing imports list, handling deduplication and flattening.
+
+        Mutates and returns ``imports``
+
+        Generally will prefer the imports in ``other`` , updating those in ``imports``.
+        If ``other`` ...
+        - doesn't match any ``module`` in ``imports``, add it!
+        - matches a single ``module`` in imports, :meth:`.Import.merge` the object imports
+        - matches multiple ``module``s in imports, then there must have been another
+            :class:`.ConditionalImport` already present, so we :meth:`.Import.merge` the existing
+            :class:`.Import` if it is one, and if it's a :class:`.ConditionalImport` just YOLO
+            and append it since there isn't a principled way to merge them from strings.
+        - is :class:`.Imports`  or a list of :class:`.Import` s, call this recursively for each
+          item.
+
+        Since imports can be merged in an undefined order depending on the generator configuration,
+        default behavior for imports with matching ``module`` is to remove them and append to the
+        end of the imports list (rather than keeping it in the position of the existing
+        :class:`.Import` ). :class:`.ConditionalImports` make it possible to have namespace
+        conflicts, so in imperative import style we assume the most recently added :class:`.Import`
+        is the one that should prevail.
+        """
+        #
         if isinstance(other, Imports) or (isinstance(other, list) and all([isinstance(i, Import) for i in other])):
-            if hasattr(self, "model_copy"):
-                self_copy = self.model_copy(deep=True)
-            else:
-                self_copy = self.copy()
-
             for i in other:
-                self_copy += i
-            return self_copy
-
-        # check if we have one of these already
-        imports = self.imports.copy()
+                imports = cls._merge(imports, i)
+            return imports
 
         existing = [i for i in imports if i.module == other.module]
 
@@ -554,8 +485,12 @@ class Imports(TemplateModel):
 
         # SPECIAL CASE - __future__ annotations must happen at the top of a file
         imports = sorted(imports, key=lambda i: i.module == "__future__", reverse=True)
+        return imports
 
-        return Imports(imports=imports)
+    def __add__(self, other: Union[Import, "Imports", List[Import]]) -> "Imports":
+        imports = self.imports.copy()
+        imports = self._merge(imports, other)
+        return Imports.model_construct(imports=imports)
 
     def __len__(self) -> int:
         return len(self.imports)
@@ -564,11 +499,61 @@ class Imports(TemplateModel):
         for i in self.imports:
             yield i
 
-    def __getitem__(self, item: int) -> Import:
-        return self.imports[item]
+    def __getitem__(self, item: Union[int, str]) -> Import:
+        if isinstance(item, int):
+            return self.imports[item]
+        elif isinstance(item, str):
+            # the name of the module
+            an_import = [i for i in self.imports if i.module == item]
+            if len(an_import) == 0:
+                raise KeyError(f"No import with module {item} was found.\nWe have: {self.imports}")
+            return an_import[0]
+        else:
+            raise TypeError(f"Can only index with an int or a string as the name of the module,\nGot: {type(item)}")
+
+    def __contains__(self, item: Union[Import, "Imports", List[Import]]) -> bool:
+        """
+        Check if all the objects are imported from the given module(s)
+
+        If the import is a bare module import (ie its :attr:`~.Import.objects` is ``None`` )
+        then we must also have a bare module import in this Imports (because even if
+        we import from the module, unless we import it specifically its name won't be
+        available in the namespace.
 
+        :attr:`.Import.alias` must always match for the same reason.
+        """
+        if isinstance(item, Imports):
+            return all([i in self for i in item.imports])
+        elif isinstance(item, list):
+            return all([i in self for i in item])
+        elif isinstance(item, Import):
+            try:
+                an_import = self[item.module]
+            except KeyError:
+                return False
+            if item.objects is None:
+                return an_import == item
+            else:
+                return all([obj in an_import.objects for obj in item.objects])
+        else:
+            raise TypeError("Imports only contains single Import objects or other Imports\n" f"Got: {type(item)}")
 
-class PydanticModule(TemplateModel):
+    @field_validator("imports", mode="after")
+    @classmethod
+    def imports_are_merged(
+        cls, imports: List[Union[Import, ConditionalImport]]
+    ) -> List[Union[Import, ConditionalImport]]:
+        """
+        When creating from a list of imports, construct model as if we have done so by iteratively
+        constructing with __add__ calls
+        """
+        merged_imports = []
+        for i in imports:
+            merged_imports = cls._merge(merged_imports, i)
+        return merged_imports
+
+
+class PydanticModule(PydanticTemplateModel):
     """
     Top-level container model for generating a pydantic module :)
     """
@@ -588,23 +573,6 @@ class PydanticModule(TemplateModel):
     Metadata for the schema to be included in a linkml_meta module-level instance of LinkMLMeta
     """
 
-    if int(PYDANTIC_VERSION[0]) >= 2:
-
-        @computed_field
-        def class_names(self) -> List[str]:
-            return [c.name for c in self.classes.values()]
-
-    else:
-        class_names: List[str] = Field(default_factory=list)
-
-        def __init__(self, **kwargs):
-            super(PydanticModule, self).__init__(**kwargs)
-            self.class_names = [c.name for c in self.classes.values()]
-
-        def render(self, environment: Optional[Environment] = None, black: bool = False) -> str:
-            """
-            Trivial override of parent method for pydantic 1 to ensure that
-            :attr:`.class_names` are correct at render time
-            """
-            self.class_names = [c.name for c in self.classes.values()]
-            return super(PydanticModule, self).render(environment, black)
+    @computed_field
+    def class_names(self) -> List[str]:
+        return [c.name for c in self.classes.values()]

linkml/generators/pydanticgen/templates/attribute.py.jinja

@@ -1,4 +1,4 @@
-{{name}}: {{ annotations['python_range'].value }} = Field({{ field }}
+{{name}}: {{ range }} = Field({{ field }}
 {%- if title != None %}, title="{{title}}"{% endif -%}
 {%- if description %}, description="""{{description}}"""{% endif -%}
 {%- if equals_number != None %}
@@ -7,10 +7,12 @@
     {%- if minimum_value != None %}, ge={{minimum_value}}{% endif -%}
     {%- if maximum_value != None %}, le={{maximum_value}}{% endif -%}
 {%- endif -%}
-{%- if meta != None -%}
-    {%- if pydantic_ver == 1 -%}
-    , linkml_meta = {{ meta | pprint | indent(width=8) }}
-    {% else -%}
+{%- if multivalued and exact_cardinality != None -%}
+    , min_length={{exact_cardinality}}, max_length={{exact_cardinality}}
+{%- elif multivalued -%}
+    {%- if minimum_cardinality != None %}, min_length={{minimum_cardinality}}{% endif -%}
+    {%- if maximum_cardinality != None %}, max_length={{maximum_cardinality}}{% endif -%}
+{%- endif -%}
+{%- if meta -%}
     , json_schema_extra = { "linkml_meta": {{ meta | pprint | indent(width=8) }} }
-    {%- endif -%}
-{%- endif -%})
+{%- endif -%})

linkml/generators/pydanticgen/templates/base_model.py.jinja

@@ -1,15 +1,3 @@
-{% if pydantic_ver == 1 %}
-class WeakRefShimBaseModel(BaseModel):
-    __slots__ = '__weakref__'
-
-class {{ name }}(WeakRefShimBaseModel,
-                validate_assignment = True,
-                validate_all = True,
-                underscore_attrs_are_private = True,
-                extra = "{{ extra_fields }}",
-                arbitrary_types_allowed = True,
-                use_enum_values = True):
-{% else %}
 class {{ name }}(BaseModel):
     model_config = ConfigDict(
         validate_assignment = True,
@@ -19,7 +7,6 @@ class {{ name }}(BaseModel):
         use_enum_values = True,
         strict = {{ strict }},
     )
-{% endif %}
 {% if fields is not none %}
     {% for field in fields %}
     {{ field }}

linkml/generators/pydanticgen/templates/class.py.jinja

@@ -4,8 +4,8 @@ class {{ name }}({% if bases is string %}{{ bases }}{% else %}{{ bases | join(',
     {{ description | indent(width=4) }}
     """
     {% endif -%}
-    {% if meta != None %}
-    linkml_meta: ClassVar[LinkMLMeta] = LinkMLMeta({% if pydantic_ver == 1 %}__root__={% endif %}{{ meta | pprint | indent(width=8) }})
+    {% if meta %}
+    linkml_meta: ClassVar[LinkMLMeta] = LinkMLMeta({{ meta | pprint | indent(width=8) }})
 
     {% endif %}
     {%  if attributes or validators %}

linkml/generators/pydanticgen/templates/footer.py.jinja

@@ -1,13 +1,5 @@
-{% if pydantic_ver == 1 %}
-# Update forward refs
-# see https://pydantic-docs.helpmanual.io/usage/postponed_annotations/
-    {% for c in class_names -%}
-{{ c }}.update_forward_refs()
-    {% endfor %}
-{% else %}
 # Model rebuild
 # see https://pydantic-docs.helpmanual.io/usage/models/#rebuilding-a-model
-    {% for c in class_names -%}
+{% for c in class_names -%}
 {{ c }}.model_rebuild()
-    {% endfor %}
-{% endif %}
+{% endfor %}

linkml/generators/pydanticgen/templates/module.py.jinja

@@ -14,8 +14,8 @@ version = "{{version if version else None}}"
 {{ c }}
     {% endfor %}
 {% endif %}
-{% if meta != None %}
-linkml_meta = LinkMLMeta({% if pydantic_ver == 1 %}__root__={% endif %}{{ meta | pprint | indent(width=4) }} )
+{% if meta %}
+linkml_meta = LinkMLMeta({{ meta | pprint | indent(width=4) }} )
 {% else %}
 linkml_meta = None
 {% endif %}

linkml/generators/pydanticgen/templates/validator.py.jinja

@@ -1,8 +1,4 @@
-{% if pydantic_ver == 1 %}
-@validator('{{name}}', allow_reuse=True)
-{% else %}
 @field_validator('{{name}}')
-{% endif %}
     def pattern_{{name}}(cls, v):
         pattern=re.compile(r"{{pattern}}")
         if isinstance(v,list):

linkml/generators/pythongen.py

@@ -54,6 +54,16 @@ class PythonGenerator(Generator):
     gen_slots: bool = True
     genmeta: bool = False
     emit_metadata: bool = True
+    dataclass_repr: bool = False
+    """
+    Whether generated dataclasses should also generate a default __repr__ method.
+    
+    Default ``False`` so that the parent :class:`linkml_runtime.utils.yamlutils.YAMLRoot` 's
+    ``__repr__`` method is inherited for model pretty printing.
+    
+    References:
+        - https://docs.python.org/3/library/dataclasses.html#dataclasses.dataclass
+    """
 
     def __post_init__(self) -> None:
         if isinstance(self.schema, Path):
@@ -388,7 +398,7 @@ dataclasses._init_fn = dataclasses_init_fn_with_kwargs
             return f"\n{self.class_or_type_name(cls.name)} = Any"
 
         cd_str = (
-            ("\n@dataclass" if slotdefs else "")
+            (f"\n@dataclass(repr={self.dataclass_repr})" if slotdefs else "")
             + f"\nclass {self.class_or_type_name(cls.name)}{parentref}:{wrapped_description}"
             + f"{self.gen_inherited_slots(cls)}"
             + f"{self.gen_class_meta(cls)}"
@@ -1171,7 +1181,7 @@ class {enum_name}(EnumDefinitionImpl):
 
 
 @shared_arguments(PythonGenerator)
-@click.command()
+@click.command(name="python")
 @click.option("--head/--no-head", default=True, show_default=True, help="Emit metadata heading")
 @click.option(
     "--genmeta/--no-genmeta",

linkml/generators/rdfgen.py

@@ -76,7 +76,7 @@ class RDFGenerator(Generator):
 
 
 @shared_arguments(RDFGenerator)
-@click.command()
+@click.command(name="rdf")
 @click.option("-o", "--output", help="Output file name")
 @click.option(
     "--context",

linkml/generators/shaclgen.py

@@ -11,7 +11,7 @@ from linkml_runtime.utils.schemaview import SchemaView
 from linkml_runtime.utils.yamlutils import TypedNode, extended_float, extended_int, extended_str
 from rdflib import BNode, Graph, Literal, URIRef
 from rdflib.collection import Collection
-from rdflib.namespace import RDF, SH, XSD
+from rdflib.namespace import RDF, RDFS, SH, XSD
 
 from linkml._version import __version__
 from linkml.generators.shacl.ifabsent_processor import IfAbsentProcessor
@@ -73,6 +73,10 @@ class ShaclGenerator(Generator):
                 class_uri_with_suffix += self.suffix
             shape_pv(RDF.type, SH.NodeShape)
             shape_pv(SH.targetClass, class_uri)  # TODO
+
+            if c.is_a:
+                shape_pv(RDFS.subClassOf, URIRef(sv.get_uri(c.is_a, expand=True)))
+
             if self.closed:
                 if c.mixin or c.abstract:
                     shape_pv(SH.closed, Literal(False))
@@ -303,7 +307,7 @@ def add_simple_data_type(func: Callable, r: ElementName) -> None:
 
 
 @shared_arguments(ShaclGenerator)
-@click.command()
+@click.command(name="shacl")
 @click.option(
     "--closed/--non-closed",
     default=True,